diff options
author | gnidorah <gnidorah@users.noreply.github.com> | 2017-05-30 16:39:27 +0300 |
---|---|---|
committer | gnidorah <gnidorah@users.noreply.github.com> | 2017-05-30 16:39:27 +0300 |
commit | a996fe849f669e5d1cafed18f299ed6ed4abec84 (patch) | |
tree | ad68ea8a770452b5ffd6bc958660855eb84dcf24 /pkgs/os-specific/linux/util-linux/default.nix | |
parent | 1d56c2fa434b2cf875aab4eabcfd69fa89fe25eb (diff) | |
download | nixpkgs-a996fe849f669e5d1cafed18f299ed6ed4abec84.tar nixpkgs-a996fe849f669e5d1cafed18f299ed6ed4abec84.tar.gz nixpkgs-a996fe849f669e5d1cafed18f299ed6ed4abec84.tar.bz2 nixpkgs-a996fe849f669e5d1cafed18f299ed6ed4abec84.tar.lz nixpkgs-a996fe849f669e5d1cafed18f299ed6ed4abec84.tar.xz nixpkgs-a996fe849f669e5d1cafed18f299ed6ed4abec84.tar.zst nixpkgs-a996fe849f669e5d1cafed18f299ed6ed4abec84.zip |
fstrim: Add service
Diffstat (limited to 'pkgs/os-specific/linux/util-linux/default.nix')
-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"; |