diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-13 15:53:51 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-13 22:09:41 +0300 |
| commit | 8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e (patch) | |
| tree | 8bab721107fae818dad896a0876d50d3d0a0d981 /pkgs/tools/graphics | |
| parent | e26119619f7ce64b065e692ba0cd31f53b9ef637 (diff) | |
| download | nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.gz nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.bz2 nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.lz nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.xz nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.zst nixlib-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.zip | |
replace makeSearchPath tree-wise to take care of possible multiple outputs
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/fgallery/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/graphics/imgur-screenshot/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/graphics/imgurbash2/default.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 6b8de80ee70e..4b263b555d21 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/share/fgallery/fgallery" \ --set PERL5LIB "$PERL5LIB" \ - --set PATH "${stdenv.lib.makeSearchPath "bin" + --set PATH "${stdenv.lib.makeBinPath [ coreutils zip imagemagick pngcrush lcms2 fbida ]}" ''; diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix index 777139d47fee..26af637300ee 100644 --- a/pkgs/tools/graphics/imgur-screenshot/default.nix +++ b/pkgs/tools/graphics/imgur-screenshot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, curl, gnugrep, libnotify, scrot, which, xclip }: -let deps = stdenv.lib.makeSearchPath "bin" [ 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}"; @@ -26,4 +26,4 @@ in stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ lw ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix index 5e7b4dcb3872..99ef87ca5dfe 100644 --- a/pkgs/tools/graphics/imgurbash2/default.nix +++ b/pkgs/tools/graphics/imgurbash2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cat <<EOF >$out/bin/imgurbash2 #!${bash}/bin/bash - PATH=${stdenv.lib.makeSearchPath "bin" [curl xsel]}:\$PATH + PATH=${stdenv.lib.makeBinPath [curl xsel]}:\$PATH EOF cat imgurbash2 >> $out/bin/imgurbash2 chmod +x $out/bin/imgurbash2 |