diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-24 12:21:18 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-05-05 11:52:08 +0200 |
| commit | b7c3c25218f8807920318ceb61b70f4343e0bd91 (patch) | |
| tree | 444b3620e7b53ef2b51d89586b23fd63ab5c31e3 /pkgs/tools/filesystems/nixpart | |
| parent | 647f0ab36604fa633169e540ce290a2f92436a92 (diff) | |
| download | nixlib-b7c3c25218f8807920318ceb61b70f4343e0bd91.tar nixlib-b7c3c25218f8807920318ceb61b70f4343e0bd91.tar.gz nixlib-b7c3c25218f8807920318ceb61b70f4343e0bd91.tar.bz2 nixlib-b7c3c25218f8807920318ceb61b70f4343e0bd91.tar.lz nixlib-b7c3c25218f8807920318ceb61b70f4343e0bd91.tar.xz nixlib-b7c3c25218f8807920318ceb61b70f4343e0bd91.tar.zst nixlib-b7c3c25218f8807920318ceb61b70f4343e0bd91.zip | |
fix ${udev} references (and a few others)
Diffstat (limited to 'pkgs/tools/filesystems/nixpart')
| -rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/blivet.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/lvm2.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index 44333b519cbe..45c79aad08e9 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -21,15 +21,15 @@ buildPythonPackage rec { sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \ blivet/devicelibs/mpath.py blivet/devices.py sed -i -e '/"wipefs"/ { - s|wipefs|${utillinux}/sbin/wipefs| + s|wipefs|${utillinux.bin}/sbin/wipefs| s/-f/--force/ }' blivet/formats/__init__.py sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py - sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py + sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py '' + (if useNixUdev then '' sed -i -e '/find_library/,/find_library/ { - c libudev = "${udev}/lib/libudev.so.1" + c libudev = "${udev.libudev}/lib/libudev.so.1" }' blivet/pyudev.py '' else '' sed -i \ diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix index 9e2b0c900794..32bf79e4a7af 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { --replace /usr/bin/tr ${coreutils}/bin/tr substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ --replace /usr/sbin/lvm $out/sbin/lvm \ - --replace /usr/bin/udevadm ${udev}/bin/udevadm + --replace /usr/bin/udevadm ${udev.out}/bin/udevadm sed -i /DEFAULT_SYS_DIR/d Makefile.in sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in @@ -42,7 +42,7 @@ stdenv.mkDerivation { postInstall = '' substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \ - --replace $out/sbin/blkid ${utillinux}/sbin/blkid + --replace $out/sbin/blkid ${utillinux.bin}/sbin/blkid # Systemd stuff mkdir -p $out/etc/systemd/system $out/lib/systemd/system-generators diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix index 90722d74ace1..a3873fb25ff0 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { substituteInPlace kpartx/kpartx.rules --replace /sbin/kpartx $out/sbin/kpartx substituteInPlace kpartx/kpartx_id --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup - substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${udev}/lib/udev/scsi_id - substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${udev}/lib/udev/scsi_id + substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${udev.libudev}/lib/udev/scsi_id + substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${udev.libudev}/lib/udev/scsi_id ''; meta = { |