diff options
| author | Florian Klink <flokli@flokli.de> | 2020-08-12 20:20:03 +0200 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2020-08-13 20:51:41 +0200 |
| commit | 2d41f0f3f01f88925fc51907ee951d69eac21005 (patch) | |
| tree | 7cf5ac1d7bc2384af41f13e64cdf1faf18c7ff0d /pkgs | |
| parent | e5a0c1cec1cf4e60ad5938b172a0e006a20b6cb1 (diff) | |
nixpart_0_4: use lib.getLib systemd instead of systemd.lib
This will pick the `lib` output if it exists, otherwise default to `out`.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/blivet.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index b05abd72bac7b..6ba29cb98d404 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py sed -i -e '/find_library/,/find_library/ { - c libudev = "${systemd.lib}/lib/libudev.so.1" + c libudev = "${stdenv.lib.getLib systemd}/lib/libudev.so.1" }' blivet/pyudev.py ''; diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix index ffed57e6345e8..36525e6fa3cd5 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -36,8 +36,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 ${systemd.lib}/lib/udev/scsi_id - substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${systemd.lib}/lib/udev/scsi_id + substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${stdenv.lib.getLib systemd}/lib/udev/scsi_id + substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${stdenv.lib.getLib systemd}/lib/udev/scsi_id sed -i -re ' s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", |