summary refs log tree commit diff
path: root/pkgs/os-specific/linux/systemd
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2018-02-25 09:07:14 -0500
committerShea Levy <shea@shealevy.com>2018-02-25 09:07:14 -0500
commit42c87765713500722b12ca8eab72826d6b279802 (patch)
tree65c3cc9d123192fe12d616bba19be5b362d7ba7e /pkgs/os-specific/linux/systemd
parent24ad5077f246f90315569b381b57fc701aa3ef77 (diff)
downloadnixpkgs-42c87765713500722b12ca8eab72826d6b279802.tar
nixpkgs-42c87765713500722b12ca8eab72826d6b279802.tar.gz
nixpkgs-42c87765713500722b12ca8eab72826d6b279802.tar.bz2
nixpkgs-42c87765713500722b12ca8eab72826d6b279802.tar.lz
nixpkgs-42c87765713500722b12ca8eab72826d6b279802.tar.xz
nixpkgs-42c87765713500722b12ca8eab72826d6b279802.tar.zst
nixpkgs-42c87765713500722b12ca8eab72826d6b279802.zip
systemd: Take python3 from buildPackages.
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
-rw-r--r--pkgs/os-specific/linux/systemd/default.nix9
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 383e3c340e6..548594d2810 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -9,12 +9,13 @@
 , patchelf
 , getent
 , hostPlatform
+, buildPackages
 }:
 
 assert stdenv.isLinux;
 
 let
-  pythonLxmlEnv = python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
+  pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
 
 in
 
@@ -35,7 +36,7 @@ in
       [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45
         ninja meson
         coreutils # meson calls date, stat etc.
-        pythonLxmlEnv glibcLocales
+        glibcLocales
         patchelf getent
       ];
     buildInputs =
@@ -43,6 +44,8 @@ in
         /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror libidn2
         libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor
         iptables gnu-efi
+        # This is actually native, but we already pull it from buildPackages
+        pythonLxmlEnv
       ];
 
     #dontAddPrefix = true;
@@ -128,7 +131,7 @@ in
 
         for i in src/basic/generate-gperfs.py src/resolve/generate-dns_type-gperf.py src/test/generate-sym-test.py ; do
           substituteInPlace $i \
-            --replace "#!/usr/bin/env python" "#!${python3Packages.python}/bin/python"
+            --replace "#!/usr/bin/env python" "#!${buildPackages.python3Packages.python}/bin/python"
         done
 
         substituteInPlace src/journal/catalog.c \