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

Changed files
+71 -72
nixos
modules
services
misc
web-servers
apache-httpd
x11
desktop-managers
system
virtualisation
pkgs
applications
misc
guake
playonlinux
roxterm
zathura
networking
browsers
chromium
firefox-bin
opera
vivaldi
dropbox
instant-messengers
hipchat
slack
mailreaders
thunderbird-bin
spideroak
science
machine-learning
math
mathematica
maxima
version-management
cvs-fast-export
cvs2svn
reposurgeon
smartgithg
desktops
kde-5
applications-15.12
development
arduino
arduino-core
compilers
haskell-modules
mobile
tools
haskell
lambdabot
web
grails
games
adom
ue4demos
misc
os-specific
linux
fanctl
pipework
pm-utils
servers
mail
dspam
xmpp
ejabberd
tools
X11
bumblebee
cd-dvd
brasero
graphics
fgallery
imgur-screenshot
imgurbash2
misc
tlp
xfstests
security
+1 -1
nixos/modules/services/misc/octoprint.nix
···
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
path = [ pluginsEnv ];
-
environment.PYTHONPATH = makeSearchPath pkgs.python.sitePackages [ pluginsEnv ];
preStart = ''
mkdir -p "${cfg.stateDir}"
···
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
path = [ pluginsEnv ];
+
environment.PYTHONPATH = makeSearchPathOutputs pkgs.python.sitePackages ["lib"] [ pluginsEnv ];
preStart = ''
mkdir -p "${cfg.stateDir}"
+1 -1
nixos/modules/services/web-servers/apache-httpd/trac.nix
···
globalEnvVars = singleton
{ name = "PYTHONPATH";
value =
-
makeSearchPath "lib/${pkgs.python.libPrefix}/site-packages"
[ pkgs.mod_python
pkgs.pythonPackages.trac
pkgs.setuptools
···
globalEnvVars = singleton
{ name = "PYTHONPATH";
value =
+
makeSearchPathOutputs "lib/${pkgs.python.libPrefix}/site-packages" ["lib"]
[ pkgs.mod_python
pkgs.pythonPackages.trac
pkgs.setuptools
+1 -1
nixos/modules/services/x11/desktop-managers/enlightenment.nix
···
e = pkgs.enlightenment;
xcfg = config.services.xserver;
cfg = xcfg.desktopManager.enlightenment;
-
GST_PLUGIN_PATH = lib.makeSearchPath "lib/gstreamer-1.0" [
pkgs.gst_all_1.gst-plugins-base
pkgs.gst_all_1.gst-plugins-good
pkgs.gst_all_1.gst-plugins-bad
···
e = pkgs.enlightenment;
xcfg = config.services.xserver;
cfg = xcfg.desktopManager.enlightenment;
+
GST_PLUGIN_PATH = lib.makeSearchPathOutputs "lib/gstreamer-1.0" ["lib"] [
pkgs.gst_all_1.gst-plugins-base
pkgs.gst_all_1.gst-plugins-good
pkgs.gst_all_1.gst-plugins-bad
+2 -2
nixos/modules/system/boot/loader/grub/grub.nix
···
version extraConfig extraPerEntryConfig extraEntries
extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout
default fsIdentifier efiSupport gfxmodeEfi gfxmodeBios;
-
path = (makeSearchPath "bin" ([
pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs
pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else [])
-
)) + ":" + (makeSearchPath "sbin" [
pkgs.mdadm pkgs.utillinux
]);
});
···
version extraConfig extraPerEntryConfig extraEntries
extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout
default fsIdentifier efiSupport gfxmodeEfi gfxmodeBios;
+
path = (makeBinPath ([
pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs
pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else [])
+
)) + ":" + (makeSearchPathOutputs "sbin" ["bin"] [
pkgs.mdadm pkgs.utillinux
]);
});
+1 -1
nixos/modules/system/boot/systemd-unit-options.nix
···
path = mkOption {
default = [];
-
apply = ps: "${makeSearchPath "bin" ps}:${makeSearchPath "sbin" ps}";
description = ''
Packages added to the service's <envar>PATH</envar>
environment variable. Both the <filename>bin</filename>
···
path = mkOption {
default = [];
+
apply = ps: "${makeBinPath ps}:${makeSearchPathOutputs "sbin" ["bin"] ps}";
description = ''
Packages added to the service's <envar>PATH</envar>
environment variable. Both the <filename>bin</filename>
+1 -1
nixos/modules/virtualisation/azure-agent.nix
···
wrapProgram "$out/bin/waagent" \
--prefix PYTHONPATH : $PYTHONPATH \
-
--prefix PATH : "${makeSearchPath "bin" runtimeDeps}"
'';
};
···
wrapProgram "$out/bin/waagent" \
--prefix PYTHONPATH : $PYTHONPATH \
+
--prefix PATH : "${makeBinPath runtimeDeps}"
'';
};
+1 -1
nixos/modules/virtualisation/virtualbox-guest.nix
···
services.xserver.displayManager.sessionCommands =
''
-
PATH=${makeSearchPath "bin" [ pkgs.gnugrep pkgs.which pkgs.xorg.xorgserver.out ]}:$PATH \
${kernel.virtualboxGuestAdditions}/bin/VBoxClient-all
'';
···
services.xserver.displayManager.sessionCommands =
''
+
PATH=${makeBinPath [ pkgs.gnugrep pkgs.which pkgs.xorg.xorgserver.out ]}:$PATH \
${kernel.virtualboxGuestAdditions}/bin/VBoxClient-all
'';
+2 -3
pkgs/applications/misc/guake/default.nix
···
with lib;
let inputs = [ dbus gtk2 gconf python2 libutempter vte keybinder gnome3.gnome_common ];
-
pySubDir = "lib/${python2.libPrefix}/site-packages";
-
pyPath = makeSearchPath pySubDir (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]);
in stdenv.mkDerivation rec {
name = "guake-${version}";
version = "0.8.3";
···
wrapProgram $bin \
--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--prefix LD_LIBRARY_PATH : ${makeLibraryPath inputs} \
-
--prefix PYTHONPATH : "$out/${pySubDir}:${pyPath}:$PYTHONPATH"
done
'';
···
with lib;
let inputs = [ dbus gtk2 gconf python2 libutempter vte keybinder gnome3.gnome_common ];
+
pyPath = makeSearchPathOutputs python2.sitePackages ["lib"] (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]);
in stdenv.mkDerivation rec {
name = "guake-${version}";
version = "0.8.3";
···
wrapProgram $bin \
--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--prefix LD_LIBRARY_PATH : ${makeLibraryPath inputs} \
+
--prefix PYTHONPATH : "$out/${python2.sitePackages}:${pyPath}:$PYTHONPATH"
done
'';
+1 -1
pkgs/applications/misc/playonlinux/default.nix
···
let
version = "4.2.9";
-
binpath = stdenv.lib.makeSearchPath "bin"
[ cabextract
python2Packages.python
gettext
···
let
version = "4.2.9";
+
binpath = stdenv.lib.makeBinPath
[ cabextract
python2Packages.python
gettext
+1 -1
pkgs/applications/misc/roxterm/default.nix
···
"-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
# Fix up python path so the lockfile library is on it.
-
PYTHONPATH = stdenv.lib.makeSearchPath "lib/${pythonFull.libPrefix}/site-packages" [
pythonPackages.curses pythonPackages.lockfile
];
···
"-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
# Fix up python path so the lockfile library is on it.
+
PYTHONPATH = stdenv.lib.makeSearchPathOutputs pythonFull.sitePackages ["lib"] [
pythonPackages.curses pythonPackages.lockfile
];
+1 -1
pkgs/applications/misc/zathura/default.nix
···
name = "zathura-${zathura_core.version}";
-
plugins_path = stdenv.lib.makeSearchPath "lib" [
zathura_djvu
zathura_ps
(if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler)
···
name = "zathura-${zathura_core.version}";
+
plugins_path = stdenv.lib.makeLibraryPath [
zathura_djvu
zathura_ps
(if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler)
+2 -2
pkgs/applications/networking/browsers/chromium/plugins.nix
···
'';
patchPhase = let
-
rpaths = [ stdenv.cc.cc.lib ];
-
mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}";
in ''
for sofile in PepperFlash/libpepflashplayer.so \
libwidevinecdm.so libwidevinecdmadapter.so; do
···
'';
patchPhase = let
+
rpaths = [ stdenv.cc.cc ];
+
mkrpath = p: "${makeSearchPathOutputs "lib64" ["lib"] p}:${makeLibraryPath p}";
in ''
for sofile in PepperFlash/libpepflashplayer.so \
libwidevinecdm.so libwidevinecdmadapter.so; do
+1 -1
pkgs/applications/networking/browsers/firefox-bin/default.nix
···
libheimdal
libpulseaudio
systemd
-
] + ":" + stdenv.lib.makeSearchPath "lib64" [
stdenv.cc.cc
];
···
libheimdal
libpulseaudio
systemd
+
] + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [
stdenv.cc.cc
];
+1 -1
pkgs/applications/networking/browsers/opera/default.nix
···
libPath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
-
(":" + stdenv.lib.makeSearchPath "lib64" buildInputs);
preFixup =
''
···
libPath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+
(":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);
preFixup =
''
+1 -1
pkgs/applications/networking/browsers/vivaldi/default.nix
···
libPath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
-
(":" + stdenv.lib.makeSearchPath "lib64" buildInputs);
buildPhase = ''
echo "Patching Vivaldi binaries"
···
libPath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+
(":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);
buildPhase = ''
echo "Patching Vivaldi binaries"
+1 -1
pkgs/applications/networking/dropbox/default.nix
···
# relative location where the dropbox libraries are stored
appdir = "opt/dropbox";
-
ldpath = stdenv.lib.makeSearchPath "lib"
[
dbus_libs gcc.cc glib libdrm libffi libICE libSM libX11 libXmu
ncurses popt qtbase qtdeclarative qtwebkit zlib
···
# relative location where the dropbox libraries are stored
appdir = "opt/dropbox";
+
ldpath = stdenv.lib.makeLibraryPath
[
dbus_libs gcc.cc glib libdrm libffi libICE libSM libX11 libXmu
ncurses popt qtbase qtdeclarative qtwebkit zlib
+1 -1
pkgs/applications/networking/instant-messengers/hipchat/default.nix
···
version = "4.0.1631";
-
rpath = stdenv.lib.makeSearchPath "lib" [
xorg.libXext
xorg.libSM
xorg.libICE
···
version = "4.0.1631";
+
rpath = stdenv.lib.makeLibraryPath [
xorg.libXext
xorg.libSM
xorg.libICE
+1 -1
pkgs/applications/networking/instant-messengers/slack/default.nix
···
version = "2.0.3";
-
rpath = stdenv.lib.makeSearchPath "lib" [
alsaLib
atk
cairo
···
version = "2.0.3";
+
rpath = stdenv.lib.makeLibraryPath [
alsaLib
atk
cairo
+1 -1
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
···
nspr
nss
pango
-
] + ":" + stdenv.lib.makeSearchPath "lib64" [
stdenv.cc.cc
];
···
nspr
nss
pango
+
] + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [
stdenv.cc.cc
];
+1 -1
pkgs/applications/networking/spideroak/default.nix
···
else if stdenv.system == "i686-linux" then "8c23271291f40aa144bbf38ceb3cc2a05bed00759c87a65bd798cf8bb289d07a"
else throw "Spideroak client for: ${stdenv.system} not supported!";
-
ldpath = stdenv.lib.makeSearchPath "lib" [
glib fontconfig libXext libX11 freetype libXrender
];
···
else if stdenv.system == "i686-linux" then "8c23271291f40aa144bbf38ceb3cc2a05bed00759c87a65bd798cf8bb289d07a"
else throw "Spideroak client for: ${stdenv.system} not supported!";
+
ldpath = stdenv.lib.makeLibraryPath [
glib fontconfig libXext libX11 freetype libXrender
];
+2 -2
pkgs/applications/science/machine-learning/torch/torch-distro.nix
···
for p in $out/bin/*; do
wrapProgram $p \
-
--suffix LD_LIBRARY_PATH ';' "${lib.makeSearchPath "lib" runtimeDeps_}" \
-
--suffix PATH ';' "${lib.makeSearchPath "bin" runtimeDeps_}" \
--suffix LUA_PATH ';' "\"$LUA_PATH\"" \
--suffix LUA_PATH ';' "\"$out/share/lua/${lua.luaversion}/?.lua;$out/share/lua/${lua.luaversion}/?/init.lua\"" \
--suffix LUA_CPATH ';' "\"$LUA_CPATH\"" \
···
for p in $out/bin/*; do
wrapProgram $p \
+
--suffix LD_LIBRARY_PATH ';' "${lib.makeLibraryPath runtimeDeps_}" \
+
--suffix PATH ';' "${lib.makeBinPath runtimeDeps_}" \
--suffix LUA_PATH ';' "\"$LUA_PATH\"" \
--suffix LUA_PATH ';' "\"$out/share/lua/${lua.luaversion}/?.lua;$out/share/lua/${lua.luaversion}/?/init.lua\"" \
--suffix LUA_CPATH ';' "\"$LUA_CPATH\"" \
+1 -1
pkgs/applications/science/math/mathematica/9.nix
···
ldpath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
-
(":" + stdenv.lib.makeSearchPath "lib64" buildInputs);
phases = "unpackPhase installPhase fixupPhase";
···
ldpath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+
(":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);
phases = "unpackPhase installPhase fixupPhase";
+1 -1
pkgs/applications/science/math/mathematica/default.nix
···
ldpath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
-
(":" + stdenv.lib.makeSearchPath "lib64" buildInputs);
phases = "unpackPhase installPhase fixupPhase";
···
ldpath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+
(":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);
phases = "unpackPhase installPhase fixupPhase";
+1 -1
pkgs/applications/science/math/maxima/default.nix
···
version = "5.36.1";
searchPath =
-
stdenv.lib.makeSearchPath "bin"
(stdenv.lib.filter (x: x != null) [ sbcl rlwrap tk gnuplot ]);
in
stdenv.mkDerivation {
···
version = "5.36.1";
searchPath =
+
stdenv.lib.makeBinPath
(stdenv.lib.filter (x: x != null) [ sbcl rlwrap tk gnuplot ]);
in
stdenv.mkDerivation {
+1 -1
pkgs/applications/version-management/cvs-fast-export/default.nix
···
postInstall =
let
-
binpath = makeSearchPath "bin" [ out rcs cvs git coreutils rsync ];
in ''
for prog in cvs-fast-export cvsconvert cvssync; do
wrapProgram $out/bin/$prog \
···
postInstall =
let
+
binpath = makeBinPath [ out rcs cvs git coreutils rsync ];
in ''
for prog in cvs-fast-export cvsconvert cvssync; do
wrapProgram $out/bin/$prog \
+1 -1
pkgs/applications/version-management/cvs2svn/default.nix
···
python ./setup.py install --prefix=$out
for i in bzr svn git; do
wrapProgram $out/bin/cvs2$i \
-
--prefix PATH : "${lib.makeSearchPath "bin" [ cvs ]}" \
--set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH"
done
'';
···
python ./setup.py install --prefix=$out
for i in bzr svn git; do
wrapProgram $out/bin/cvs2$i \
+
--prefix PATH : "${lib.makeBinPath [ cvs ]}" \
--set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH"
done
'';
+2 -2
pkgs/applications/version-management/reposurgeon/default.nix
···
postInstall =
let
-
binpath = makeSearchPath "bin" (
filter (x: x != null)
[ out git bazaar cvs darcs fossil mercurial
monotone rcs src subversion cvs_fast_export ]
);
-
pythonpath = makeSearchPath (python27.sitePackages) (
filter (x: x != null)
[ python27Packages.readline or null python27Packages.hglib or null ]
);
···
postInstall =
let
+
binpath = makeBinPath (
filter (x: x != null)
[ out git bazaar cvs darcs fossil mercurial
monotone rcs src subversion cvs_fast_export ]
);
+
pythonpath = makeSearchPathOutputs python27.sitePackages ["lib"] (
filter (x: x != null)
[ python27Packages.readline or null python27Packages.hglib or null ]
);
+1 -1
pkgs/applications/version-management/smartgithg/default.nix
···
pkg_path = "$out/${name}";
bin_path = "$out/bin";
install_freedesktop_items = ./install_freedesktop_items.sh;
-
runtime_paths = lib.makeSearchPath "bin" [
jre
#git mercurial subversion # the paths are requested in configuration
which
···
pkg_path = "$out/${name}";
bin_path = "$out/bin";
install_freedesktop_items = ./install_freedesktop_items.sh;
+
runtime_paths = lib.makeBinPath [
jre
#git mercurial subversion # the paths are requested in configuration
which
+1 -1
pkgs/desktops/kde-5/applications-15.12/ark.nix
···
, zip
}:
-
let PATH = lib.makeSearchPath "bin" [
p7zip unrar unzipNLS zip
];
in
···
, zip
}:
+
let PATH = lib.makeBinPath [
p7zip unrar unzipNLS zip
];
in
+1 -1
pkgs/development/arduino/arduino-core/default.nix
···
fi
done
-
patchelf --set-rpath ${stdenv.lib.makeSearchPath "lib" [ libusb ]} \
"$out/share/arduino/hardware/tools/avrdude"
'';
···
fi
done
+
patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ libusb ]} \
"$out/share/arduino/hardware/tools/avrdude"
'';
+1 -1
pkgs/development/compilers/elm/default.nix
···
doCheck = false;
buildTools = drv.buildTools or [] ++ [ makeWrapper ];
postInstall =
-
let bins = lib.makeSearchPath "bin" [ nodejs self.elm-make ];
in ''
wrapProgram $out/bin/elm-repl \
--prefix PATH ':' ${bins}
···
doCheck = false;
buildTools = drv.buildTools or [] ++ [ makeWrapper ];
postInstall =
+
let bins = lib.makeBinPath [ nodejs self.elm-make ];
in ''
wrapProgram $out/bin/elm-repl \
--prefix PATH ':' ${bins}
+1 -1
pkgs/development/compilers/julia/default.nix
···
NIX_CFLAGS_COMPILE = [ "-fPIC" ];
-
LD_LIBRARY_PATH = makeSearchPath "lib" [
arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
openspecfun pcre2 suitesparse
];
···
NIX_CFLAGS_COMPILE = [ "-fPIC" ];
+
LD_LIBRARY_PATH = makeLibraryPath [
arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
openspecfun pcre2 suitesparse
];
+2 -2
pkgs/development/compilers/julia/git.nix
···
NIX_CFLAGS_COMPILE = [ "-fPIC" ];
-
LD_LIBRARY_PATH = makeSearchPath "lib" (concatLists (map (x : x.all) [
arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
openspecfun pcre2 suitesparse
-
]));
dontStrip = true;
dontPatchELF = true;
···
NIX_CFLAGS_COMPILE = [ "-fPIC" ];
+
LD_LIBRARY_PATH = makeLibraryPath [
arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
openspecfun pcre2 suitesparse
+
];
dontStrip = true;
dontPatchELF = true;
+1 -1
pkgs/development/haskell-modules/with-packages-wrapper.nix
···
hasLibraries = lib.any (x: x.isHaskellLibrary) paths;
# CLang is needed on Darwin for -fllvm to work:
# https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/code-generators.html
-
llvm = lib.makeSearchPath "bin"
([ llvmPackages.llvm ]
++ lib.optional stdenv.isDarwin llvmPackages.clang);
in
···
hasLibraries = lib.any (x: x.isHaskellLibrary) paths;
# CLang is needed on Darwin for -fllvm to work:
# https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/code-generators.html
+
llvm = lib.makeBinPath
([ llvmPackages.llvm ]
++ lib.optional stdenv.isDarwin llvmPackages.clang);
in
+1 -1
pkgs/development/mobile/androidenv/androidndk.nix
···
sed_script_2 =
"'s|^MYNDKDIR=`dirname $0`" +
"|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'";
-
runtime_paths = (lib.makeSearchPath "bin" [
coreutils file findutils
gawk gnugrep gnused
jdk
···
sed_script_2 =
"'s|^MYNDKDIR=`dirname $0`" +
"|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'";
+
runtime_paths = (lib.makeBinPath [
coreutils file findutils
gawk gnugrep gnused
jdk
+1 -1
pkgs/development/mobile/androidenv/androidndk_r8e.nix
···
sed_script_2 =
"'s|^MYNDKDIR=`dirname $0`" +
"|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'";
-
runtime_paths = (lib.makeSearchPath "bin" [
coreutils file findutils
gawk gnugrep gnused
jdk
···
sed_script_2 =
"'s|^MYNDKDIR=`dirname $0`" +
"|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'";
+
runtime_paths = (lib.makeBinPath [
coreutils file findutils
gawk gnugrep gnused
jdk
+8 -8
pkgs/development/tools/haskell/lambdabot/default.nix
···
inherit haskellPackages;
packages = allPkgs;
};
-
bins = lib.makeSearchPath "bin" ([ mueval'
-
(haskellPackages.ghcWithPackages allPkgs)
-
haskellPackages.unlambda
-
haskellPackages.brainfuck
-
]
-
++ lib.optional withDjinn haskellPackages.djinn
-
++ lib.optional (aspell != null) aspell
-
);
modulesStr = lib.replaceChars ["\n"] [" "] modules;
configStr = lib.replaceChars ["\n"] [" "] configuration;
···
inherit haskellPackages;
packages = allPkgs;
};
+
bins = lib.makeBinPath ([ mueval'
+
(haskellPackages.ghcWithPackages allPkgs)
+
haskellPackages.unlambda
+
haskellPackages.brainfuck
+
]
+
++ lib.optional withDjinn haskellPackages.djinn
+
++ lib.optional (aspell != null) aspell
+
);
modulesStr = lib.replaceChars ["\n"] [" "] modules;
configStr = lib.replaceChars ["\n"] [" "] configuration;
+1 -1
pkgs/development/web/grails/default.nix
···
}:
let
-
binpath = stdenv.lib.makeSearchPath "bin"
([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk);
in
stdenv.mkDerivation rec {
···
}:
let
+
binpath = stdenv.lib.makeBinPath
([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk);
in
stdenv.mkDerivation rec {
+1 -1
pkgs/games/adom/default.nix
···
inherit (xorg) libXext libX11;
-
lpath = "${stdenv.cc.cc}/lib64:" + stdenv.lib.makeSearchPath "lib" [
zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib libpulseaudio];
in
···
inherit (xorg) libXext libX11;
+
lpath = "${stdenv.cc.cc.lib}/lib64:" + stdenv.lib.makeLibraryPath [
zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib libpulseaudio];
in
+1 -1
pkgs/games/ue4demos/default.nix
···
rtdeps = stdenv.lib.makeLibraryPath
[ xorg.libXxf86vm xorg.libXext openal ]
-
+ ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.cc.cc ];
buildCommand =
''
···
rtdeps = stdenv.lib.makeLibraryPath
[ xorg.libXxf86vm xorg.libXext openal ]
+
+ ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [ stdenv.cc.cc ];
buildCommand =
''
+1 -1
pkgs/misc/cups/filters.nix
···
}:
let
-
binPath = stdenv.lib.makeSearchPath "bin" [ coreutils gnused bc gawk gnugrep which ];
in stdenv.mkDerivation rec {
name = "cups-filters-${version}";
···
}:
let
+
binPath = stdenv.lib.makeBinPath [ coreutils gnused bc gawk gnugrep which ];
in stdenv.mkDerivation rec {
name = "cups-filters-${version}";
+1 -1
pkgs/os-specific/linux/fanctl/default.nix
···
postPatch = ''
substituteInPlace fanctl \
--replace '@PATH@' \
-
'${lib.makeSearchPath "bin" [
gnugrep gawk coreutils bridge-utils iproute dnsmasq
iptables kmod utillinux gnused
glibc # needed for getent
···
postPatch = ''
substituteInPlace fanctl \
--replace '@PATH@' \
+
'${lib.makeBinPath [
gnugrep gawk coreutils bridge-utils iproute dnsmasq
iptables kmod utillinux gnused
glibc # needed for getent
+1 -1
pkgs/os-specific/linux/pipework/default.nix
···
mkdir -p $out/bin
cp pipework $out/bin
wrapProgram $out/bin/pipework --prefix PATH : \
-
${lib.makeSearchPath "bin" [ bridge-utils iproute lxc openvswitch docker busybox dhcpcd dhcp ]};
'';
meta = with lib; {
description = "Software-Defined Networking tools for LXC";
···
mkdir -p $out/bin
cp pipework $out/bin
wrapProgram $out/bin/pipework --prefix PATH : \
+
${lib.makeBinPath [ bridge-utils iproute lxc openvswitch docker busybox dhcpcd dhcp ]};
'';
meta = with lib; {
description = "Software-Defined Networking tools for LXC";
+2 -2
pkgs/os-specific/linux/pm-utils/default.nix
···
let
-
binPath = stdenv.lib.makeSearchPath "bin"
[ coreutils gnugrep utillinux module_init_tools procps kbd dbus_tools ];
-
sbinPath = stdenv.lib.makeSearchPath "sbin"
[ procps ];
in
···
let
+
binPath = stdenv.lib.makeBinPath
[ coreutils gnugrep utillinux module_init_tools procps kbd dbus_tools ];
+
sbinPath = stdenv.lib.makeSearchPathOutputs "sbin" ["bin"]
[ procps ];
in
+1 -1
pkgs/servers/mail/dspam/default.nix
···
++ lib.optional withSQLite "sqlite3_drv"
++ lib.optional withDB "libdb4_drv"
);
-
maintenancePath = lib.makeSearchPath "bin" [ gawk gnused gnugrep coreutils which ];
in stdenv.mkDerivation rec {
name = "dspam-3.10.2";
···
++ lib.optional withSQLite "sqlite3_drv"
++ lib.optional withDB "libdb4_drv"
);
+
maintenancePath = lib.makeBinPath [ gawk gnused gnugrep coreutils which ];
in stdenv.mkDerivation rec {
name = "dspam-3.10.2";
+1 -1
pkgs/servers/xmpp/ejabberd/default.nix
···
}:
let
-
ctlpath = lib.makeSearchPath "bin" [ bash gnused gnugrep coreutils utillinux procps ];
fakegit = writeScriptBin "git" ''
#! ${stdenv.shell} -e
···
}:
let
+
ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
fakegit = writeScriptBin "git" ''
#! ${stdenv.shell} -e
+1 -1
pkgs/tools/X11/bumblebee/default.nix
···
nvidiaLibs = lib.makeLibraryPath nvidia_x11s;
-
bbdPath = lib.makeSearchPath "bin" [ module_init_tools xorgserver ];
bbdLibs = lib.makeLibraryPath [ libX11 libXext ];
xmodules = lib.concatStringsSep "," (map (x: "${x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau));
···
nvidiaLibs = lib.makeLibraryPath nvidia_x11s;
+
bbdPath = lib.makeBinPath [ module_init_tools xorgserver ];
bbdLibs = lib.makeLibraryPath [ libX11 libXext ];
xmodules = lib.concatStringsSep "," (map (x: "${x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau));
+1 -1
pkgs/tools/cd-dvd/brasero/default.nix
···
let
major = "3.12";
minor = "0";
-
binpath = stdenv.lib.makeSearchPath "bin" [ dvdauthor cdrdao dvdplusrwtools cdrtools ];
in stdenv.mkDerivation rec {
version = "${major}.${minor}";
···
let
major = "3.12";
minor = "0";
+
binpath = stdenv.lib.makeBinPath [ dvdauthor cdrdao dvdplusrwtools cdrtools ];
in stdenv.mkDerivation rec {
version = "${major}.${minor}";
+1 -1
pkgs/tools/graphics/fgallery/default.nix
···
wrapProgram "$out/share/fgallery/fgallery" \
--set PERL5LIB "$PERL5LIB" \
-
--set PATH "${stdenv.lib.makeSearchPath "bin"
[ coreutils zip imagemagick pngcrush lcms2 fbida ]}"
'';
···
wrapProgram "$out/share/fgallery/fgallery" \
--set PERL5LIB "$PERL5LIB" \
+
--set PATH "${stdenv.lib.makeBinPath
[ coreutils zip imagemagick pngcrush lcms2 fbida ]}"
'';
+2 -2
pkgs/tools/graphics/imgur-screenshot/default.nix
···
{ stdenv, fetchFromGitHub, makeWrapper, curl, gnugrep, libnotify, scrot, which, xclip }:
-
let deps = stdenv.lib.makeSearchPath "bin" [ curl gnugrep libnotify scrot which xclip ];
in stdenv.mkDerivation rec {
version = "1.5.4";
name = "imgur-screenshot-${version}";
···
license = licenses.mit;
maintainers = with maintainers; [ lw ];
};
-
}
···
{ stdenv, fetchFromGitHub, makeWrapper, curl, gnugrep, libnotify, scrot, which, xclip }:
+
let deps = stdenv.lib.makeBinPath [ curl gnugrep libnotify scrot which xclip ];
in stdenv.mkDerivation rec {
version = "1.5.4";
name = "imgur-screenshot-${version}";
···
license = licenses.mit;
maintainers = with maintainers; [ lw ];
};
+
}
+1 -1
pkgs/tools/graphics/imgurbash2/default.nix
···
mkdir -p $out/bin
cat <<EOF >$out/bin/imgurbash2
#!${bash}/bin/bash
-
PATH=${stdenv.lib.makeSearchPath "bin" [curl xsel]}:\$PATH
EOF
cat imgurbash2 >> $out/bin/imgurbash2
chmod +x $out/bin/imgurbash2
···
mkdir -p $out/bin
cat <<EOF >$out/bin/imgurbash2
#!${bash}/bin/bash
+
PATH=${stdenv.lib.makeBinPath [curl xsel]}:\$PATH
EOF
cat imgurbash2 >> $out/bin/imgurbash2
chmod +x $out/bin/imgurbash2
+1 -1
pkgs/tools/misc/tlp/default.nix
···
buildInputs = [ perl ];
-
paths = lib.makeSearchPath "bin"
([ iw rfkill hdparm ethtool inetutils systemd module_init_tools pciutils smartmontools
x86_energy_perf_policy gawk gnugrep coreutils
]
···
buildInputs = [ perl ];
+
paths = lib.makeBinPath
([ iw rfkill hdparm ethtool inetutils systemd module_init_tools pciutils smartmontools
x86_energy_perf_policy gawk gnugrep coreutils
]
+1 -1
pkgs/tools/misc/xfstests/default.nix
···
ln -s @out@/lib/xfstests/$f $f
done
-
export PATH=${lib.makeSearchPath "bin" [acl attr bc e2fsprogs fio gawk libcap_progs lvm2 perl procps psmisc su utillinux which xfsprogs]}:$PATH
exec ./check "$@"
'';
···
ln -s @out@/lib/xfstests/$f $f
done
+
export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk libcap_progs lvm2 perl procps psmisc su utillinux which xfsprogs]}:$PATH
exec ./check "$@"
'';
+1 -1
pkgs/tools/security/pass/default.nix
···
'' else ""}
'';
-
wrapperPath = with stdenv.lib; makeSearchPath "bin/" ([
coreutils
gnused
getopt
···
'' else ""}
'';
+
wrapperPath = with stdenv.lib; makeBinPath ([
coreutils
gnused
getopt
+1 -1
pkgs/tools/security/pass/rofi-pass.nix
···
cp -a $src/config.example $out/share/doc/rofi-pass/config.example
'';
-
wrapperPath = with stdenv.lib; makeSearchPath "bin/" [
coreutils
findutils
gnugrep
···
cp -a $src/config.example $out/share/doc/rofi-pass/config.example
'';
+
wrapperPath = with stdenv.lib; makeBinPath [
coreutils
findutils
gnugrep
+1 -1
pkgs/tools/security/pcsctools/default.nix
···
, perl, pcscperl, Glib, Gtk2, Pango
}:
-
let deps = lib.makeSearchPath "bin" [ wget coreutils ];
in stdenv.mkDerivation rec {
name = "pcsc-tools-1.4.25";
···
, perl, pcscperl, Glib, Gtk2, Pango
}:
+
let deps = lib.makeBinPath [ wget coreutils ];
in stdenv.mkDerivation rec {
name = "pcsc-tools-1.4.25";