diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 17:25:22 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 17:25:22 +0100 |
commit | 54299b60c4a3b2ae3bfb0817b7443aec10a2def2 (patch) | |
tree | 7c076b38cd6eac430d8dbff1ecf088727f2a74f3 /pkgs/tools | |
parent | 824c8dfa9573d1913fd3f21b586f0188de042c91 (diff) | |
parent | e97e6902440b17cc1c9b05d41fd38f7c0b291139 (diff) | |
download | nixpkgs-54299b60c4a3b2ae3bfb0817b7443aec10a2def2.tar nixpkgs-54299b60c4a3b2ae3bfb0817b7443aec10a2def2.tar.gz nixpkgs-54299b60c4a3b2ae3bfb0817b7443aec10a2def2.tar.bz2 nixpkgs-54299b60c4a3b2ae3bfb0817b7443aec10a2def2.tar.lz nixpkgs-54299b60c4a3b2ae3bfb0817b7443aec10a2def2.tar.xz nixpkgs-54299b60c4a3b2ae3bfb0817b7443aec10a2def2.tar.zst nixpkgs-54299b60c4a3b2ae3bfb0817b7443aec10a2def2.zip |
Merge #12779: Mass replace `pkg}/bin`-style strings
... to refer to correct outputs
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/audio/beets/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/backup/store-backup/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/compression/pxz/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/jhead/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/easyrsa/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/djvu2pdf/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/virtualization/ec2-ami-tools/default.nix | 2 |
7 files changed, 7 insertions, 7 deletions
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 '' 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 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}\" ''; 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 = '' 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 <<EOF 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 diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index dee14db46bc..6ccce4684ad 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { for i in $out/bin/*; do wrapProgram $i \ --set EC2_HOME $out \ - --prefix PATH : ${ruby}/bin:${openssl}/bin + --prefix PATH : ${ruby}/bin:${openssl.bin}/bin done sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/ec2/platform/base/pipeline.rb |