From cdb18068cde28d53b0ce64e2a8f32b1a20b8717f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 21 Jul 2017 08:09:02 -0500 Subject: [PATCH] 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. --- pkgs/os-specific/linux/zfs/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 1e28cfe000f7..a47b43a1f0f3 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 '';