public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

processing: fix build (ZHF)

Browse Source
This commit is contained in:
Luca Bruno 2015-07-21 16:18:21 +02:00
parent 5c485cfff5
commit 5a4d349ce7
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/graphics/processing/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, ant, jre, makeWrapper, libXxf86vm, which }: { fetchurl, stdenv, ant, jdk, makeWrapper, libXxf86vm, which }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "processing-${version}"; name = "processing-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# Stop it trying to download its own version of java # Stop it trying to download its own version of java
patches = [ ./use-nixpkgs-jre.patch ]; patches = [ ./use-nixpkgs-jre.patch ];
buildInputs = [ ant jre makeWrapper libXxf86vm which ]; buildInputs = [ ant jdk makeWrapper libXxf86vm which ];
buildPhase = "cd build && ant build"; buildPhase = "cd build && ant build";
@ -21,12 +21,12 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin mkdir -p $out/bin
cp -r linux/work/* $out/${name}/ cp -r linux/work/* $out/${name}/
makeWrapper $out/${name}/processing $out/bin/processing \ 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 --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
makeWrapper $out/${name}/processing-java $out/bin/processing-java \ 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 --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
ln -s ${jre} $out/${name}/java ln -s ${jdk} $out/${name}/java
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

5
pkgs/top-level/all-packages.nix
View File

@ -12365,7 +12365,10 @@ let
qiv = callPackage ../applications/graphics/qiv { }; qiv = callPackage ../applications/graphics/qiv { };
processing = callPackage ../applications/graphics/processing { inherit (xorg) libXxf86vm; }; processing = callPackage ../applications/graphics/processing {
inherit (xorg) libXxf86vm;
jdk = jdk7;
};
# perhaps there are better apps for this task? It's how I had configured my preivous system. # perhaps there are better apps for this task? It's how I had configured my preivous system.
# And I don't want to rewrite all rules # And I don't want to rewrite all rules