jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zfs: fix invalid use of substituteInPlace

Browse Source 
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.
This commit is contained in:
Thomas Tuegel 2017-07-21 08:09:02 -05:00 committed by Franz Pletz
parent 6f0ef6bb32
commit cdb18068cd
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/linux/zfs/default.nix
View File

@ -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
'';