diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-04 17:43:32 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-04 17:43:32 +0200 |
commit | 08d4e4ce18fdce1082316621320619ad85726891 (patch) | |
tree | 0d8f90356123ad58c331a9efea78e5023efe4f3c /pkgs | |
parent | 2db9a8289d6dc34cdb335b1acacd126bce42c88b (diff) | |
parent | 3afae4037b7deac7af54f45dc4b2e027c4335e48 (diff) | |
download | nixlib-08d4e4ce18fdce1082316621320619ad85726891.tar nixlib-08d4e4ce18fdce1082316621320619ad85726891.tar.gz nixlib-08d4e4ce18fdce1082316621320619ad85726891.tar.bz2 nixlib-08d4e4ce18fdce1082316621320619ad85726891.tar.lz nixlib-08d4e4ce18fdce1082316621320619ad85726891.tar.xz nixlib-08d4e4ce18fdce1082316621320619ad85726891.tar.zst nixlib-08d4e4ce18fdce1082316621320619ad85726891.zip |
Merge pull request #8175 from wizeman/u/zfs-fix-rm
zfs: Fix systemd warning
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/zfs/generic.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index b040201cf337..1613dcb311a2 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences +{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils , configFile ? "all" # Userspace dependencies @@ -46,7 +46,8 @@ stdenv.mkDerivation rec { substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" substituteInPlace ./module/Makefile.in --replace "/bin/cp" "cp" - + substituteInPlace ./etc/systemd/system/zfs-share.service.in \ + --replace "@bindir@/rm " "${coreutils}/bin/rm " ./autogen.sh ''; |