summary refs log tree commit diff
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2016-02-01 20:46:02 +0200
committerTuomas Tynkkynen <tuomas@tuxera.com>2016-02-01 20:46:02 +0200
commit76cfa449dc81cbc6d178ff4564cbc3211f0945aa (patch)
treec01393c54059b33b2160162d239de71e6b158cf4
parent9700be43813a5ce707fd7e126c64fd8d1cca0205 (diff)
downloadnixlib-76cfa449dc81cbc6d178ff4564cbc3211f0945aa.tar
nixlib-76cfa449dc81cbc6d178ff4564cbc3211f0945aa.tar.gz
nixlib-76cfa449dc81cbc6d178ff4564cbc3211f0945aa.tar.bz2
nixlib-76cfa449dc81cbc6d178ff4564cbc3211f0945aa.tar.lz
nixlib-76cfa449dc81cbc6d178ff4564cbc3211f0945aa.tar.xz
nixlib-76cfa449dc81cbc6d178ff4564cbc3211f0945aa.tar.zst
nixlib-76cfa449dc81cbc6d178ff4564cbc3211f0945aa.zip
treewide: Mass replace 'flac}/bin' to refer the 'bin' output
-rw-r--r--pkgs/applications/audio/caudec/default.nix2
-rw-r--r--pkgs/tools/audio/beets/default.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix
index 978dd27facdb..d84ff702ce87 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 35a69262acde..3cdd4b4f0a2e 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 ''