diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 01:06:51 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 01:18:10 +0300 |
| commit | 74a3a2cd7e409062ad3efa61e84d366a8f67c853 (patch) | |
| tree | 3c12e08e51c0d1a2ec942ca02cb9cdbcc407b35d /pkgs/applications/graphics | |
| parent | c2553952195cb390c9ae65e2a31ad02cc82d0f76 (diff) | |
| download | nixpkgs-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar nixpkgs-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.gz nixpkgs-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.bz2 nixpkgs-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.lz nixpkgs-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.xz nixpkgs-74a3a2cd7e409062ad3efa61e84d366a8f67c853.tar.zst nixpkgs-74a3a2cd7e409062ad3efa61e84d366a8f67c853.zip | |
treewide: Use makeBinPath
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/geeqie/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/graphics/processing/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 04119f3f1c6..952d23bbc48 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # Allow geeqie to find exiv2 and exiftran, necessary to # losslessly rotate JPEG images. sed -i $out/lib/geeqie/geeqie-rotate \ - -e '1 a export PATH=${exiv2}/bin:${fbida}/bin:$PATH' + -e '1 a export PATH=${stdenv.lib.makeBinPath [ exiv2 fbida ]}:$PATH' ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index 69e5ccb85ec..a66e9163142 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -r linux/work/* $out/${name}/ makeWrapper $out/${name}/processing $out/bin/processing \ - --prefix PATH : "${jdk}/bin:${which}/bin" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ jdk which ]}" \ --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib makeWrapper $out/${name}/processing-java $out/bin/processing-java \ - --prefix PATH : "${jdk}/bin:${which}/bin" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ jdk which ]}" \ --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib ln -s ${jdk} $out/${name}/java ''; |