diff options
-rw-r--r-- | nixos/modules/services/hardware/udev.nix | 4 | ||||
-rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 14 | ||||
-rw-r--r-- | pkgs/applications/audio/spotify/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/editors/lighttable/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libvirt/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/node-webkit/nw11.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/node-webkit/nw9.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/drivers/foo2zjs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/drbd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/lvm2/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/multipath-tools/default.nix | 4 | ||||
-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 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
16 files changed, 30 insertions, 30 deletions
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 50588e449587..b3baf1a44611 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -55,13 +55,13 @@ let --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount done - echo -n "Checking that all programs called by relative paths in udev rules exist in ${udev}/lib/udev... " + echo -n "Checking that all programs called by relative paths in udev rules exist in ${pkgs.udev.out}/lib/udev... " import_progs=$(grep 'IMPORT{program}="[^/$]' $out/* | sed -e 's/.*IMPORT{program}="\([^ "]*\)[ "].*/\1/' | uniq) run_progs=$(grep -v '^[[:space:]]*#' $out/* | grep 'RUN+="[^/$]' | sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq) for i in $import_progs $run_progs; do - if [[ ! -x ${pkgs.udev}/lib/udev/$i && ! $i =~ socket:.* ]]; then + if [[ ! -x ${pkgs.udev.out}/lib/udev/$i && ! $i =~ socket:.* ]]; then echo "FAIL" echo "$i is called in udev rules but not installed by udev" exit 1 diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 8b58eccdcec7..af1353952d8b 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -60,9 +60,9 @@ let copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm # Copy udev. - copy_bin_and_libs ${udev}/lib/systemd/systemd-udevd - copy_bin_and_libs ${udev}/bin/udevadm - for BIN in ${udev}/lib/udev/*_id; do + copy_bin_and_libs ${udev.out}/lib/systemd/systemd-udevd + copy_bin_and_libs ${udev.out}/bin/udevadm + for BIN in ${udev.libudev}/lib/udev/*_id; do copy_bin_and_libs $BIN done @@ -73,7 +73,7 @@ let ${config.boot.initrd.extraUtilsCommands} # Copy ld manually since it isn't detected correctly - cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib + cp -pv ${pkgs.glibc.out}/lib/ld*.so.? $out/lib # Copy all of the needed libraries for the binaries for BIN in $(find $out/{bin,sbin} -type f); do @@ -140,9 +140,9 @@ let echo 'ENV{LD_LIBRARY_PATH}="${extraUtils}/lib"' > $out/00-env.rules - cp -v ${udev}/lib/udev/rules.d/60-cdrom_id.rules $out/ - cp -v ${udev}/lib/udev/rules.d/60-persistent-storage.rules $out/ - cp -v ${udev}/lib/udev/rules.d/80-drivers.rules $out/ + cp -v ${udev.out}/lib/udev/rules.d/60-cdrom_id.rules $out/ + cp -v ${udev.out}/lib/udev/rules.d/60-persistent-storage.rules $out/ + cp -v ${udev.out}/lib/udev/rules.d/80-drivers.rules $out/ cp -v ${pkgs.lvm2}/lib/udev/rules.d/*.rules $out/ ${config.boot.initrd.extraUdevRulesCommands} diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index d66029199ce8..7a7e71f8218c 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -79,8 +79,8 @@ stdenv.mkDerivation { ln -s ${nss}/lib/libsmime3.so $libdir/libsmime3.so.1d ${if stdenv.system == "x86_64-linux" then '' - ln -s ${openssl}/lib/libssl.so $libdir/libssl.so.1.0.0 - ln -s ${openssl}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0 + ln -s ${openssl.out}/lib/libssl.so $libdir/libssl.so.1.0.0 + ln -s ${openssl.out}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0 ln -s ${nspr}/lib/libnspr4.so $libdir/libnspr4.so ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so '' else '' @@ -91,7 +91,7 @@ stdenv.mkDerivation { ''} # Work around Spotify trying to open libudev.so.1 (which we don't have) - ln -s ${udev}/lib/libudev.so.1 $libdir/libudev.so.1 + ln -s ${udev.libudev}/lib/libudev.so.1 $libdir/libudev.so.1 mkdir -p $out/bin diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index d4fa56898c36..287aab31fec1 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ $out/LightTable/ltbin - ln -sf ${udev}/lib/libudev.so.1 $out/LightTable/libudev.so.0 + ln -sf ${udev.libudev}/lib/libudev.so.1 $out/LightTable/libudev.so.0 makeWrapper $out/LightTable/ltbin $out/bin/lighttable \ --prefix "LD_LIBRARY_PATH" : $out/LightTable diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 247a27ca37be..e46b44191975 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -144,7 +144,7 @@ let s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")| }' chrome/utility/media_galleries/image_metadata_extractor.cc - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${udev}/lib/\1!' \ + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${udev.libudev}/lib/\1!' \ device/udev_linux/udev?_loader.cc sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 9c9bf40b8e81..6e4f7f4ce5da 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:${dnsmasq}/bin:$PATH + PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev.out}/sbin:${dnsmasq}/bin:$PATH patchShebangs . # fixes /usr/bin/python references ''; diff --git a/pkgs/development/tools/node-webkit/nw11.nix b/pkgs/development/tools/node-webkit/nw11.nix index 978213f67601..14109c256666 100644 --- a/pkgs/development/tools/node-webkit/nw11.nix +++ b/pkgs/development/tools/node-webkit/nw11.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot - ln -s ${udev}/lib/libudev.so $out/share/node-webkit/libudev.so.0 + ln -s ${udev.libudev}/lib/libudev.so $out/share/node-webkit/libudev.so.0 patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot diff --git a/pkgs/development/tools/node-webkit/nw9.nix b/pkgs/development/tools/node-webkit/nw9.nix index 97399e5268ce..f8ca7eb03b27 100644 --- a/pkgs/development/tools/node-webkit/nw9.nix +++ b/pkgs/development/tools/node-webkit/nw9.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot - ln -s ${udev}/lib/libudev.so $out/share/node-webkit/libudev.so.0 + ln -s ${udev.libudev}/lib/libudev.so $out/share/node-webkit/libudev.so.0 patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix index 2417b0e566de..83546b44198a 100644 --- a/pkgs/misc/drivers/foo2zjs/default.nix +++ b/pkgs/misc/drivers/foo2zjs/default.nix @@ -36,7 +36,7 @@ rec { ''PIXMAPS=$out/share/pixmaps'' ''UDEVBIN=$out/bin'' ''UDEVDIR=$out/etc/udev/rules.d'' - ''UDEVD=${udev}/sbin/udevd'' + ''UDEVD=${udev.out}/sbin/udevd'' ''LIBUDEVDIR=$out/lib/udev/rules.d'' ''USBDIR=$out/etc/hotplug/usb'' ''FOODB=$out/share/foomatic/db/source'' diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 4c945a7fbac7..3491cf713917 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preConfigure = '' - export PATH=${udev}/sbin:$PATH + export PATH=${udev.out}/sbin:$PATH substituteInPlace user/Makefile.in --replace /sbin/ $out/sbin/ substituteInPlace user/legacy/Makefile.in \ --replace /sbin/ $out/sbin/ \ diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 228f7b34be01..8ebe2b5ed7f1 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -25,7 +25,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 diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 3da37a89923a..03c86dec4a00 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.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 = { 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 = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e241fc6fc6da..a82efb9b030c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9746,7 +9746,7 @@ let postPatch = '' sed -i -e '/udev_library_name/,/^ *libudev/ { - s|CDLL([^,]*|CDLL("${pkgs.udev}/lib/libudev.so.1"|p; d + s|CDLL([^,]*|CDLL("${pkgs.udev.libudev}/lib/libudev.so.1"|p; d }' pyudev/_libudev.py ''; |