diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-07-21 16:18:21 +0200 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-07-21 16:18:21 +0200 |
| commit | 5a4d349ce70ac8f220ee8f56e98a881e4f2cc5d0 (patch) | |
| tree | 84db5ba3d1157024a2766669d53c6b61a56c0ff9 /pkgs/applications/graphics/processing | |
| parent | 5c485cfff5e6b4b0066bd0daae538d408abf733b (diff) | |
| download | nixpkgs-5a4d349ce70ac8f220ee8f56e98a881e4f2cc5d0.tar nixpkgs-5a4d349ce70ac8f220ee8f56e98a881e4f2cc5d0.tar.gz nixpkgs-5a4d349ce70ac8f220ee8f56e98a881e4f2cc5d0.tar.bz2 nixpkgs-5a4d349ce70ac8f220ee8f56e98a881e4f2cc5d0.tar.lz nixpkgs-5a4d349ce70ac8f220ee8f56e98a881e4f2cc5d0.tar.xz nixpkgs-5a4d349ce70ac8f220ee8f56e98a881e4f2cc5d0.tar.zst nixpkgs-5a4d349ce70ac8f220ee8f56e98a881e4f2cc5d0.zip | |
processing: fix build (ZHF)
Diffstat (limited to 'pkgs/applications/graphics/processing')
| -rw-r--r-- | pkgs/applications/graphics/processing/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index ecce0e260bb..69e5ccb85ec 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ant, jre, makeWrapper, libXxf86vm, which }: +{ fetchurl, stdenv, ant, jdk, makeWrapper, libXxf86vm, which }: stdenv.mkDerivation rec { name = "processing-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # Stop it trying to download its own version of java patches = [ ./use-nixpkgs-jre.patch ]; - buildInputs = [ ant jre makeWrapper libXxf86vm which ]; + buildInputs = [ ant jdk makeWrapper libXxf86vm which ]; buildPhase = "cd build && ant build"; @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -r linux/work/* $out/${name}/ makeWrapper $out/${name}/processing $out/bin/processing \ - --prefix PATH : "${jre}/bin:${which}/bin" \ + --prefix PATH : "${jdk}/bin:${which}/bin" \ --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib makeWrapper $out/${name}/processing-java $out/bin/processing-java \ - --prefix PATH : "${jre}/bin:${which}/bin" \ + --prefix PATH : "${jdk}/bin:${which}/bin" \ --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib - ln -s ${jre} $out/${name}/java + ln -s ${jdk} $out/${name}/java ''; meta = with stdenv.lib; { |