From 3a3ed33f2628048d2f8aabe683cc46cf6f70886d Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 6 Jun 2016 12:28:38 +0200 Subject: [PATCH 1/2] abcde: fix flac bin output --- pkgs/applications/audio/abcde/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index b5ccde86619a..01b848d2d95d 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -52,7 +52,7 @@ in --replace '#!/usr/bin/perl' '#!${perl}/bin/perl' wrapProgram "$out/bin/abcde" --prefix PATH ":" \ - "$out/bin:${which}/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbis-tools}/bin:${id3v2}/bin:${eyeD3}/bin:${lame}/bin:${flac}/bin" + "$out/bin:${which}/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbis-tools}/bin:${id3v2}/bin:${eyeD3}/bin:${lame}/bin:${flac.bin}/bin" wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \ "${wget}/bin" From b886ce25c1bce03dcd5a92654007405f69cc1ad8 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 6 Jun 2016 13:42:07 +0200 Subject: [PATCH 2/2] abcde: use makeBinPath to construct wrapper PATH --- pkgs/applications/audio/abcde/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index 01b848d2d95d..dba813b39e1d 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -52,7 +52,7 @@ in --replace '#!/usr/bin/perl' '#!${perl}/bin/perl' wrapProgram "$out/bin/abcde" --prefix PATH ":" \ - "$out/bin:${which}/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbis-tools}/bin:${id3v2}/bin:${eyeD3}/bin:${lame}/bin:${flac.bin}/bin" + ${stdenv.lib.makeBinPath [ "$out" which libcdio cddiscid wget vorbis-tools id3v2 eyeD3 lame flac ]} wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \ "${wget}/bin"