replace makeSearchPath tree-wise to take care of possible multiple outputs

This commit is contained in:
Nikolay Amiantov
2016-04-13 15:53:51 +03:00
parent e26119619f
commit 8b7ebaffeb
56 changed files with 71 additions and 72 deletions

View File

@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
'' else ""}
'';
wrapperPath = with stdenv.lib; makeSearchPath "bin/" ([
wrapperPath = with stdenv.lib; makeBinPath ([
coreutils
gnused
getopt

View File

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
cp -a $src/config.example $out/share/doc/rofi-pass/config.example
'';
wrapperPath = with stdenv.lib; makeSearchPath "bin/" [
wrapperPath = with stdenv.lib; makeBinPath [
coreutils
findutils
gnugrep

View File

@@ -3,7 +3,7 @@
, perl, pcscperl, Glib, Gtk2, Pango
}:
let deps = lib.makeSearchPath "bin" [ wget coreutils ];
let deps = lib.makeBinPath [ wget coreutils ];
in stdenv.mkDerivation rec {
name = "pcsc-tools-1.4.25";