summary refs log tree commit diff
path: root/pkgs/os-specific/linux/zfs
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-07-21 08:09:02 -0500
committerFranz Pletz <fpletz@fnordicwalking.de>2017-07-29 20:59:08 +0200
commitcdb18068cde28d53b0ce64e2a8f32b1a20b8717f (patch)
treed391316d2e6bd920bf96dd3ae20d70b5a0b14dc3 /pkgs/os-specific/linux/zfs
parent6f0ef6bb3259031ddf2a3a69905a5ec7a86a1067 (diff)
downloadnixpkgs-cdb18068cde28d53b0ce64e2a8f32b1a20b8717f.tar
nixpkgs-cdb18068cde28d53b0ce64e2a8f32b1a20b8717f.tar.gz
nixpkgs-cdb18068cde28d53b0ce64e2a8f32b1a20b8717f.tar.bz2
nixpkgs-cdb18068cde28d53b0ce64e2a8f32b1a20b8717f.tar.lz
nixpkgs-cdb18068cde28d53b0ce64e2a8f32b1a20b8717f.tar.xz
nixpkgs-cdb18068cde28d53b0ce64e2a8f32b1a20b8717f.tar.zst
nixpkgs-cdb18068cde28d53b0ce64e2a8f32b1a20b8717f.zip
zfs: fix invalid use of substituteInPlace
substituteInPlace was invoked with multiple targets on the command line, which
is not supported.

(cherry picked from commit b21defaf51daf002f94bb57bf0f5073b153247db)

Re-applied due to bad merge in b116fa5ff2a832b24ffbc3ed3fa703ca6bf904ed.
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 1e28cfe000f..a47b43a1f0f 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -45,7 +45,6 @@ in stdenv.mkDerivation rec {
     substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "mount -t zfs"            "${utillinux}/bin/mount -t zfs"
     substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount"             "${utillinux}/bin/umount"
     substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount"              "${utillinux}/bin/mount"
-    substituteInPlace ./udev/rules.d/*            --replace "/lib/udev/vdev_id"       "$out/lib/udev/vdev_id"
     substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/ztest"         "$out/sbin/ztest"
     substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/zdb"           "$out/sbin/zdb"
     substituteInPlace ./config/user-systemd.m4    --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"
@@ -55,6 +54,12 @@ in stdenv.mkDerivation rec {
     substituteInPlace ./module/Makefile.in        --replace "/bin/cp"                 "cp"
     substituteInPlace ./etc/systemd/system/zfs-share.service.in \
       --replace "@bindir@/rm " "${coreutils}/bin/rm "
+
+    for f in ./udev/rules.d/*
+    do
+      substituteInPlace "$f" --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id"
+    done
+
     ./autogen.sh
   '';