summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorajs124 <git@ajs124.de>2021-07-13 19:34:19 +0200
committerajs124 <git@ajs124.de>2021-07-13 19:34:57 +0200
commit698bf970e11e11ff2b2dc087c87e1c9ce17f9d5e (patch)
tree1556281fbc065c843cba6ac70280e5b67e1fbc02 /pkgs/os-specific
parente223f84cd8c279b892c53f5d779d6e63eb4277eb (diff)
downloadnixpkgs-698bf970e11e11ff2b2dc087c87e1c9ce17f9d5e.tar
nixpkgs-698bf970e11e11ff2b2dc087c87e1c9ce17f9d5e.tar.gz
nixpkgs-698bf970e11e11ff2b2dc087c87e1c9ce17f9d5e.tar.bz2
nixpkgs-698bf970e11e11ff2b2dc087c87e1c9ce17f9d5e.tar.lz
nixpkgs-698bf970e11e11ff2b2dc087c87e1c9ce17f9d5e.tar.xz
nixpkgs-698bf970e11e11ff2b2dc087c87e1c9ce17f9d5e.tar.zst
nixpkgs-698bf970e11e11ff2b2dc087c87e1c9ce17f9d5e.zip
hyperv-daemons: use python3 for kernels that support it
Support for python3 was added in https://github.com/torvalds/linux/commit/8a99c920092f444cf9f1d737ae76527102886d8e
it is therefore supported in every kernel including and after 4.19
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/hyperv-daemons/default.nix9
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix
index 2b6bf6fc63a..a659908a7a0 100644
--- a/pkgs/os-specific/linux/hyperv-daemons/default.nix
+++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, python, kernel, makeWrapper, writeText
+{ stdenv, lib, python2, python3, kernel, makeWrapper, writeText
 , gawk, iproute2 }:
 
 let
@@ -9,6 +9,7 @@ let
     inherit (kernel) src version;
 
     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
     hardeningDisable = [ "format" ];
@@ -33,10 +34,6 @@ let
       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
 
-      # 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
     '';
 
@@ -86,7 +83,7 @@ in stdenv.mkDerivation {
     Wants=hv-fcopy.service hv-kvp.service hv-vss.service
     EOF
 
-    for f in $lib/lib/systemd/system/* ; do
+    for f in $lib/lib/systemd/system/*.service ; do
       substituteInPlace $f --replace @out@ ${daemons}/bin
     done