From 9782c593edcfd4f7f41689f4ecb2390dbf1bc003 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 1 Feb 2016 20:45:55 +0200 Subject: [PATCH 01/12] treewide: Mass replace 'acl}/bin' to refer the 'bin' output --- pkgs/applications/misc/udevil/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index 75c02d3ba6d..8ce683ec908 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { --with-mount-prog=${utillinux}/bin/mount \ --with-umount-prog=${utillinux}/bin/umount \ --with-losetup-prog=${utillinux}/bin/losetup \ - --with-setfacl-prog=${acl}/bin/setfacl \ + --with-setfacl-prog=${acl.bin}/bin/setfacl \ --sysconfdir=$prefix/etc ''; preConfigure = '' From 5f4a8de7541c5ce6e62a1e53a51d58f543dbdf70 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 1 Feb 2016 20:45:57 +0200 Subject: [PATCH 02/12] treewide: Mass replace 'bzip2}/bin' to refer the 'bin' output --- .../version-management/git-and-tools/cgit/default.nix | 2 +- pkgs/os-specific/linux/sysstat/default.nix | 2 +- pkgs/servers/http/nix-binary-cache/default.nix | 4 ++-- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 2 +- pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 +- pkgs/tools/backup/store-backup/default.nix | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 6cde64b3090..ec92470468e 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ - -e 's|"bzip2"|"${bzip2}/bin/bzip2"|' \ + -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \ -e 's|"xz"|"${xz}/bin/xz"|' \ -i ui-snapshot.c ''; diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 6544210b206..16431c465c1 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = '' export PATH_CP=$(type -tp cp) export PATH_CHKCONFIG=/no-such-program - export BZIP=${bzip2}/bin/bzip2 + export BZIP=${bzip2.bin}/bin/bzip2 export SYSTEMCTL=systemctl ''; diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index b007c09b056..857d4bb4d49 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { --replace @findutils@ "${findutils}/bin" \ --replace @nix@ "${nix}/bin" \ --replace @xz@ "${xz}/bin" \ - --replace @bzip2@ "${bzip2}/bin" \ + --replace @bzip2@ "${bzip2.bin}/bin" \ --replace @gnused@ "${gnused}/bin" \ --replace @gnugrep@ "${gnugrep}/bin" \ --replace @openssl@ "${openssl}/bin" \ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { --replace @findutils@ "${findutils}/bin" \ --replace @nix@ "${nix}/bin" \ --replace @xz@ "${xz}/bin" \ - --replace @bzip2@ "${bzip2}/bin" \ + --replace @bzip2@ "${bzip2.bin}/bin" \ --replace @gnused@ "${gnused}/bin" \ --replace @gnugrep@ "${gnugrep}/bin" \ --replace @openssl@ "${openssl}/bin" \ diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 6b562eef53c..dd35e03478a 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -166,7 +166,7 @@ rec { cp -d ${gawk}/bin/awk $out/bin cp ${gnutar}/bin/tar $out/bin cp ${gzip}/bin/gzip $out/bin - cp ${bzip2}/bin/bzip2 $out/bin + cp ${bzip2.bin}/bin/bzip2 $out/bin cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin cp ${patchelf}/bin/* $out/bin diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index d33d8f9fb66..5732437970d 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -79,7 +79,7 @@ rec { cp -d ${gawk}/bin/awk $out/bin cp ${gnutar}/bin/tar $out/bin cp ${gzip}/bin/gzip $out/bin - cp ${bzip2}/bin/bzip2 $out/bin + cp ${bzip2.bin}/bin/bzip2 $out/bin cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin cp ${patchelf}/bin/* $out/bin diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix index 93a7f9e1e39..9329cd23e83 100644 --- a/pkgs/tools/backup/store-backup/default.nix +++ b/pkgs/tools/backup/store-backup/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { for p in $out/bin/* do wrapProgram "$p" \ --prefix PERL5LIB ":" "${perlPackages.DBFile}/lib/perl5/site_perl" \ - --prefix PATH ":" "${which}/bin:${bzip2}/bin" + --prefix PATH ":" "${which}/bin:${bzip2.bin}/bin" done patchShebangs $out From a4dff4bf1bb9e66ad553e5b43b244b77060d98ae Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 1 Feb 2016 20:45:59 +0200 Subject: [PATCH 03/12] treewide: Mass replace 'dbus_daemon}/bin' to refer the 'out' output --- pkgs/applications/misc/dunst/default.nix | 2 +- pkgs/development/libraries/glib/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index c398c3c43d0..651c74b2d21 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram "$out/bin/dunst" \ - --prefix PATH : '${dbus_daemon}/bin' + --prefix PATH : '${dbus_daemon.out}/bin' ''; meta = { diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 7feccdef9aa..894dee3990c 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { export XDG_RUNTIME_HOME="$TMP" export HOME="$TMP" export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share" - export G_TEST_DBUS_DAEMON="${dbus_daemon}/bin/dbus-daemon" + export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon" substituteInPlace gio/tests/desktop-files/home/applications/epiphany-weather-for-toronto-island-9c6a4e022b17686306243dada811d550d25eb1fb.desktop --replace "Exec=/bin/true" "Exec=${coreutils}/bin/true" # Needs machine-id, comment the test From 9700be43813a5ce707fd7e126c64fd8d1cca0205 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 1 Feb 2016 20:46:00 +0200 Subject: [PATCH 04/12] treewide: Mass replace 'djvulibre}/bin' to refer the 'bin' output --- pkgs/tools/typesetting/djvu2pdf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix index 512efe497fa..a426356a09f 100644 --- a/pkgs/tools/typesetting/djvu2pdf/default.nix +++ b/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -p djvu2pdf $out/bin - wrapProgram $out/bin/djvu2pdf --prefix PATH : ${ghostscript}/bin:${djvulibre}/bin:${which}/bin + wrapProgram $out/bin/djvu2pdf --prefix PATH : ${ghostscript}/bin:${djvulibre.bin}/bin:${which}/bin mkdir -p $out/man/man1 cp -p djvu2pdf.1.gz $out/man/man1 From 76cfa449dc81cbc6d178ff4564cbc3211f0945aa Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 1 Feb 2016 20:46:02 +0200 Subject: [PATCH 05/12] treewide: Mass replace 'flac}/bin' to refer the 'bin' output --- pkgs/applications/audio/caudec/default.nix | 2 +- pkgs/tools/audio/beets/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index 978dd27facd..d84ff702ce8 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postFixup = '' for executable in $(cd $out/bin && ls); do wrapProgram $out/bin/$executable \ - --prefix PATH : "${bc}/bin:${findutils}/bin:${sox}/bin:${procps}/bin:${opusTools}/bin:${lame}/bin:${flac}/bin" + --prefix PATH : "${bc}/bin:${findutils}/bin:${sox}/bin:${procps}/bin:${opusTools}/bin:${lame}/bin:${flac.bin}/bin" done ''; diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 35a69262acd..3cdd4b4f0a2 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -121,7 +121,7 @@ in buildPythonPackage rec { }' beets/ui/commands.py '' + optionalString enableBadfiles '' sed -i -e '/self\.run_command(\[/ { - s,"flac","${flac}/bin/flac", + s,"flac","${flac.bin}/bin/flac", s,"mp3val","${mp3val}/bin/mp3val", }' beetsplug/badfiles.py '' + optionalString enableReplaygain '' From 0eb84e882bde4c539dc7c0e3f192cc5742f6a570 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 1 Feb 2016 20:46:10 +0200 Subject: [PATCH 06/12] treewide: Mass replace 'libjpeg}/bin' to refer the 'bin' output --- pkgs/tools/graphics/jhead/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index dfbd7c4e5e0..2fb1c9325c0 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { substituteInPlace jhead.c \ --replace "\" Compiled: \"__DATE__" "" \ - --replace "jpegtran -trim" "${libjpeg}/bin/jpegtran -trim" + --replace "jpegtran -trim" "${libjpeg.bin}/bin/jpegtran -trim" ''; installPhase = '' From 3cc7fa0be91ba9ac4dd9b96c551de79220b27704 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 1 Feb 2016 20:46:15 +0200 Subject: [PATCH 07/12] treewide: Mass replace 'lzma}/bin' to refer the 'bin' output --- pkgs/build-support/vm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 2311b0d2fec..fffdc85d2bc 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -574,7 +574,7 @@ rec { buildCommand = '' ${createRootFS} - PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc.bin}/bin:${lzma}/bin + PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc.bin}/bin:${lzma.bin}/bin # Unpack the .debs. We do this to prevent pre-install scripts # (which have lots of circular dependencies) from barfing. From 13b3f3f246fdb8dfc854c5283aa1dc88d1e774d1 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 1 Feb 2016 20:46:16 +0200 Subject: [PATCH 08/12] treewide: Mass replace 'openssl}/bin' to refer the 'bin' output --- nixos/modules/services/web-servers/apache-httpd/owncloud.nix | 2 +- nixos/modules/system/boot/luksroot.nix | 2 +- pkgs/applications/networking/mailreaders/mailpile/default.nix | 2 +- pkgs/applications/virtualization/openstack/keystone.nix | 2 +- pkgs/development/libraries/opendkim/default.nix | 2 +- pkgs/development/tools/sslmate/default.nix | 2 +- pkgs/servers/http/nix-binary-cache/default.nix | 4 ++-- pkgs/servers/shellinabox/default.nix | 2 +- pkgs/tools/networking/easyrsa/default.nix | 2 +- pkgs/tools/virtualization/ec2-ami-tools/default.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix index 9994de0f9b4..5633f30e4a8 100644 --- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix +++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix @@ -333,7 +333,7 @@ let 'version' => '${config.package.version}', - 'openssl' => '${pkgs.openssl}/bin/openssl' + 'openssl' => '${pkgs.openssl.bin}/bin/openssl' ); diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 6ea11e60b26..77a82547031 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -436,7 +436,7 @@ in ${optionalString luks.yubikeySupport '' copy_bin_and_libs ${pkgs.ykpers}/bin/ykchalresp copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo - copy_bin_and_libs ${pkgs.openssl}/bin/openssl + copy_bin_and_libs ${pkgs.openssl.bin}/bin/openssl cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto strip -s pbkdf2-sha512 diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index c43944dc597..b3ca52999ef 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonPackage rec { postInstall = '' wrapProgram $out/bin/mailpile \ - --prefix PATH ":" "${gnupg1orig}/bin:${openssl}/bin" + --prefix PATH ":" "${gnupg1orig}/bin:${openssl.bin}/bin" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix index 3060dcb04cb..ff60dc36405 100644 --- a/pkgs/applications/virtualization/openstack/keystone.nix +++ b/pkgs/applications/virtualization/openstack/keystone.nix @@ -33,7 +33,7 @@ pythonPackages.buildPythonPackage rec { ldap ldappool webtest requests2 oslotest pep8 pymongo which ]; - makeWrapperArgs = ["--prefix PATH : '${openssl}/bin:$PATH'"]; + makeWrapperArgs = ["--prefix PATH : '${openssl.bin}/bin:$PATH'"]; postInstall = '' # install .ini files diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index e89cd880df1..7f4b5ba2e32 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/sbin/opendkim-genkey \ - --prefix PATH : ${openssl}/bin + --prefix PATH : ${openssl.bin}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix index 72af1898451..8def4b6a665 100644 --- a/pkgs/development/tools/sslmate/default.nix +++ b/pkgs/development/tools/sslmate/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { JSONPP TermReadKey ]}" \ - --prefix PATH : "${openssl}/bin" + --prefix PATH : "${openssl.bin}/bin" ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index 857d4bb4d49..be7cadac44d 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace @bzip2@ "${bzip2.bin}/bin" \ --replace @gnused@ "${gnused}/bin" \ --replace @gnugrep@ "${gnugrep}/bin" \ - --replace @openssl@ "${openssl}/bin" \ + --replace @openssl@ "${openssl.bin}/bin" \ --replace @lighttpd@ "${lighttpd}/sbin" \ --replace @iproute@ "${iproute}/sbin" \ --replace "xXxXx" "xXxXx" @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { --replace @bzip2@ "${bzip2.bin}/bin" \ --replace @gnused@ "${gnused}/bin" \ --replace @gnugrep@ "${gnugrep}/bin" \ - --replace @openssl@ "${openssl}/bin" \ + --replace @openssl@ "${openssl.bin}/bin" \ --replace @lighttpd@ "${lighttpd}/sbin" \ --replace @iproute@ "${iproute}/sbin" \ --replace "xXxXx" "xXxXx" diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index 6df4905af2c..c9f4e2d253f 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { substituteInPlace ./shellinabox/launcher.c --replace "/usr/games" "${openssh}/bin" substituteInPlace ./shellinabox/service.c --replace "/bin/login" "${shadow}/bin/login" substituteInPlace ./shellinabox/launcher.c --replace "/bin/login" "${shadow}/bin/login" - substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl}/bin" + substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl.bin}/bin" ''; postInstall = '' diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index 2b41f8ca1d3..59d97a4a18b 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { install -D -m755 easyrsa3/easyrsa $out/bin/easyrsa substituteInPlace $out/bin/easyrsa \ --subst-var out \ - --subst-var-by openssl ${openssl}/bin/openssl + --subst-var-by openssl ${openssl.bin}/bin/openssl # Helper utility cat > $out/bin/easyrsa-init < Date: Mon, 1 Feb 2016 20:46:18 +0200 Subject: [PATCH 09/12] treewide: Mass replace 'poppler_utils}/bin' to refer the 'out' output --- pkgs/applications/misc/calibre/default.nix | 2 +- pkgs/applications/search/recoll/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index f464c3ccd02..916173fa73b 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { for a in $out/bin/*; do wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH \ - --prefix PATH : ${poppler_utils}/bin + --prefix PATH : ${poppler_utils.out}/bin done ''; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 631555234ce..a9599614c3e 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { substituteInPlace $f --replace gunzip ${gzip}/bin/gunzip substituteInPlace $f --replace iconv ${libiconv.bin}/bin/iconv substituteInPlace $f --replace lyx ${lyx}/bin/lyx - substituteInPlace $f --replace pdftotext ${poppler_utils}/bin/pdftotext + substituteInPlace $f --replace pdftotext ${poppler_utils.out}/bin/pdftotext substituteInPlace $f --replace pstotext ${ghostscript}/bin/ps2ascii substituteInPlace $f --replace sed ${gnused}/bin/sed substituteInPlace $f --replace tar ${gnutar}/bin/tar From 33e7a2549afd53851c3ca1bd89395c90442a2530 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 1 Feb 2016 20:46:23 +0200 Subject: [PATCH 10/12] treewide: Mass replace 'xfsprogs}/bin' to refer the 'bin' output --- nixos/modules/programs/xfs_quota.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/xfs_quota.nix b/nixos/modules/programs/xfs_quota.nix index 90b6304fa99..648fd9a8a94 100644 --- a/nixos/modules/programs/xfs_quota.nix +++ b/nixos/modules/programs/xfs_quota.nix @@ -89,8 +89,8 @@ in nameValuePair "xfs_quota-${name}" { description = "Setup xfs_quota for project ${name}"; script = '' - ${pkgs.xfsprogs}/bin/xfs_quota -x -c 'project -s ${name}' ${opts.fileSystem} - ${pkgs.xfsprogs}/bin/xfs_quota -x -c 'limit -p ${limitOptions opts} ${name}' ${opts.fileSystem} + ${pkgs.xfsprogs.bin}/bin/xfs_quota -x -c 'project -s ${name}' ${opts.fileSystem} + ${pkgs.xfsprogs.bin}/bin/xfs_quota -x -c 'limit -p ${limitOptions opts} ${name}' ${opts.fileSystem} ''; wantedBy = [ "multi-user.target" ]; From 5dfcafb20552f89a569e605e1007b3000b8ac3b3 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 1 Feb 2016 20:46:27 +0200 Subject: [PATCH 11/12] treewide: Mass replace 'xwayland}/bin' to refer the 'out' output --- pkgs/applications/window-managers/weston/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 0720368222d..f154d3c28c7 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (vaapi != null) "--enabe-vaapi-recorder" ++ stdenv.lib.optionals (xwayland != null) [ "--enable-xwayland" - "--with-xserver-path=${xwayland}/bin/Xwayland" + "--with-xserver-path=${xwayland.out}/bin/Xwayland" ]; meta = with stdenv.lib; { From e97e6902440b17cc1c9b05d41fd38f7c0b291139 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 1 Feb 2016 20:46:28 +0200 Subject: [PATCH 12/12] treewide: Mass replace 'xz}/bin' to refer the 'bin' output --- .../version-management/git-and-tools/cgit/default.nix | 2 +- pkgs/applications/virtualization/docker/default.nix | 2 +- pkgs/servers/http/nix-binary-cache/default.nix | 4 ++-- pkgs/tools/compression/pxz/default.nix | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index ec92470468e..3c8712cc2f9 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \ - -e 's|"xz"|"${xz}/bin/xz"|' \ + -e 's|"xz"|"${xz.bin}/bin/xz"|' \ -i ui-snapshot.c ''; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 2af39cd33de..54c9ed7b1ab 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit makeWrapper $out/libexec/docker/docker $out/bin/docker \ - --prefix PATH : "${iproute}/sbin:sbin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin:${utillinux}/bin:${optionalString enableLxc "${lxc}/bin"}" + --prefix PATH : "${iproute}/sbin:sbin:${iptables}/sbin:${e2fsprogs}/sbin:${xz.bin}/bin:${utillinux}/bin:${optionalString enableLxc "${lxc}/bin"}" # systemd install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index be7cadac44d..674557d74fc 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { --replace @coreutils@ "${coreutils}/bin" \ --replace @findutils@ "${findutils}/bin" \ --replace @nix@ "${nix}/bin" \ - --replace @xz@ "${xz}/bin" \ + --replace @xz@ "${xz.bin}/bin" \ --replace @bzip2@ "${bzip2.bin}/bin" \ --replace @gnused@ "${gnused}/bin" \ --replace @gnugrep@ "${gnugrep}/bin" \ @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { --replace @coreutils@ "${coreutils}/bin" \ --replace @findutils@ "${findutils}/bin" \ --replace @nix@ "${nix}/bin" \ - --replace @xz@ "${xz}/bin" \ + --replace @xz@ "${xz.bin}/bin" \ --replace @bzip2@ "${bzip2.bin}/bin" \ --replace @gnused@ "${gnused}/bin" \ --replace @gnugrep@ "${gnugrep}/bin" \ diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix index 07c3e205a98..f6424b5e880 100644 --- a/pkgs/tools/compression/pxz/default.nix +++ b/pkgs/tools/compression/pxz/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { gcc -o pxz pxz.c -llzma \ -fopenmp -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 \ -DPXZ_BUILD_DATE=\"nixpkgs\" \ - -DXZ_BINARY=\"${xz}/bin/xz\" \ + -DXZ_BINARY=\"${xz.bin}/bin/xz\" \ -DPXZ_VERSION=\"${version}\" '';