diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-06-07 11:46:17 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-06-07 11:46:17 +0200 |
| commit | 338cdea33244cca624793150102461827c01e8d2 (patch) | |
| tree | 858d0f98dcac9765e316a00549d4298005a80acf /pkgs/os-specific | |
| parent | fad6fc3dae16b5161895165bf275e329e20860d6 (diff) | |
| parent | a996fe849f669e5d1cafed18f299ed6ed4abec84 (diff) | |
| download | nixpkgs-338cdea33244cca624793150102461827c01e8d2.tar nixpkgs-338cdea33244cca624793150102461827c01e8d2.tar.gz nixpkgs-338cdea33244cca624793150102461827c01e8d2.tar.bz2 nixpkgs-338cdea33244cca624793150102461827c01e8d2.tar.lz nixpkgs-338cdea33244cca624793150102461827c01e8d2.tar.xz nixpkgs-338cdea33244cca624793150102461827c01e8d2.tar.zst nixpkgs-338cdea33244cca624793150102461827c01e8d2.zip | |
Merge branch 'master2' of https://github.com/gnidorah/nixpkgs into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/util-linux/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 9126a1cdec3..5d7f701b39e 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -29,6 +29,10 @@ stdenv.mkDerivation rec { preConfigure = "export scanf_cv_type_modifier=ms"; }; + preConfigure = lib.optionalString (systemd != null) '' + configureFlags+="--with-systemd --with-systemdsystemunitdir=$bin/lib/systemd/system/" + ''; + # !!! It would be better to obtain the path to the mount helpers # (/sbin/mount.*) through an environment variable, but that's # somewhat risky because we have to consider that mount can setuid @@ -40,10 +44,6 @@ stdenv.mkDerivation rec { --disable-use-tty-group --enable-fs-paths-default=/run/wrappers/bin:/var/run/current-system/sw/bin:/sbin ${if ncurses == null then "--without-ncurses" else ""} - ${if systemd == null then "" else '' - --with-systemd - --with-systemdsystemunitdir=$out/lib/systemd/system/ - ''} ''; makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin"; |