diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-07-21 08:09:02 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-07-21 15:47:37 -0500 |
| commit | b21defaf51daf002f94bb57bf0f5073b153247db (patch) | |
| tree | f2fe3135bca9b28255acf1f8658b4bb33ecda529 /pkgs/os-specific | |
| parent | 20321f66d7f8b434b84d4f3f4cb6353367256bc7 (diff) | |
| download | nixlib-b21defaf51daf002f94bb57bf0f5073b153247db.tar nixlib-b21defaf51daf002f94bb57bf0f5073b153247db.tar.gz nixlib-b21defaf51daf002f94bb57bf0f5073b153247db.tar.bz2 nixlib-b21defaf51daf002f94bb57bf0f5073b153247db.tar.lz nixlib-b21defaf51daf002f94bb57bf0f5073b153247db.tar.xz nixlib-b21defaf51daf002f94bb57bf0f5073b153247db.tar.zst nixlib-b21defaf51daf002f94bb57bf0f5073b153247db.zip | |
zfs: fix invalid use of substituteInPlace
substituteInPlace was invoked with multiple targets on the command line, which is not supported.
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 7 |
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 414f2ba444a2..9e8856fdcdc0 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -44,7 +44,6 @@ let 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" @@ -54,6 +53,12 @@ let 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 ''; |