diff options
| author | Domen Kožar <domen@dev.si> | 2014-06-09 23:09:32 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-06-09 23:09:32 +0200 |
| commit | 7334e38af5ef1c91c1a65810a102236a50871e4a (patch) | |
| tree | 4aa7cfe3d71bbcf2a0f1f328b60f27fb39731968 | |
| parent | fb9c0d53b20a21b00209db1675429cce2f7089a3 (diff) | |
| parent | 71b923fa74c4f04abb3e60cf252867b62edeb26a (diff) | |
| download | nixlib-7334e38af5ef1c91c1a65810a102236a50871e4a.tar nixlib-7334e38af5ef1c91c1a65810a102236a50871e4a.tar.gz nixlib-7334e38af5ef1c91c1a65810a102236a50871e4a.tar.bz2 nixlib-7334e38af5ef1c91c1a65810a102236a50871e4a.tar.lz nixlib-7334e38af5ef1c91c1a65810a102236a50871e4a.tar.xz nixlib-7334e38af5ef1c91c1a65810a102236a50871e4a.tar.zst nixlib-7334e38af5ef1c91c1a65810a102236a50871e4a.zip | |
Merge pull request #2678 from offlinehacker/pkgs/systemd/fix_python
systemd: fix python support
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 522907e2aee2..3445c3cd2dd3 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -2,13 +2,13 @@ , xz, pam, acl, cryptsetup, libuuid, m4, utillinux , glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl , kexectools, libmicrohttpd, linuxHeaders -, python ? null, pythonSupport ? false +, pythonPackages ? null, pythonSupport ? false , autoreconfHook }: assert stdenv.isLinux; -assert pythonSupport -> python != null; +assert pythonSupport -> pythonPackages != null; stdenv.mkDerivation rec { version = "212"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { /* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl libmicrohttpd linuxHeaders autoreconfHook - ] ++ stdenv.lib.optional pythonSupport python; + ] ++ stdenv.lib.optionals pythonSupport [pythonPackages.python pythonPackages.lxml]; configureFlags = [ "--localstatedir=/var" |