hyperv-daemons: use python3 for kernels that support it
Support for python3 was added in 8a99c92009
it is therefore supported in every kernel including and after 4.19
This commit is contained in:
parent
e223f84cd8
commit
698bf970e1
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, lib, python, kernel, makeWrapper, writeText
|
{ stdenv, lib, python2, python3, kernel, makeWrapper, writeText
|
||||||
, gawk, iproute2 }:
|
, gawk, iproute2 }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -9,6 +9,7 @@ let
|
||||||
inherit (kernel) src version;
|
inherit (kernel) src version;
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
buildInputs = [ (if lib.versionOlder version "4.19" then python2 else python3) ];
|
||||||
|
|
||||||
# as of 4.9 compilation will fail due to -Werror=format-security
|
# as of 4.9 compilation will fail due to -Werror=format-security
|
||||||
hardeningDisable = [ "format" ];
|
hardeningDisable = [ "format" ];
|
||||||
|
@ -33,10 +34,6 @@ let
|
||||||
install -Dm755 hv_get_dhcp_info.sh $out/${libexec}/hv_get_dhcp_info
|
install -Dm755 hv_get_dhcp_info.sh $out/${libexec}/hv_get_dhcp_info
|
||||||
install -Dm755 hv_get_dns_info.sh $out/${libexec}/hv_get_dns_info
|
install -Dm755 hv_get_dns_info.sh $out/${libexec}/hv_get_dns_info
|
||||||
|
|
||||||
# I don't know why this isn't being handled automatically by fixupPhase
|
|
||||||
substituteInPlace $out/bin/lsvmbus \
|
|
||||||
--replace '/usr/bin/env python' ${python.interpreter}
|
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -86,7 +83,7 @@ in stdenv.mkDerivation {
|
||||||
Wants=hv-fcopy.service hv-kvp.service hv-vss.service
|
Wants=hv-fcopy.service hv-kvp.service hv-vss.service
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
for f in $lib/lib/systemd/system/* ; do
|
for f in $lib/lib/systemd/system/*.service ; do
|
||||||
substituteInPlace $f --replace @out@ ${daemons}/bin
|
substituteInPlace $f --replace @out@ ${daemons}/bin
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue