diff options
| author | Cillian de Róiste <cillian.deroiste@gmail.com> | 2014-09-02 00:25:18 +0200 |
|---|---|---|
| committer | Cillian de Róiste <cillian.deroiste@gmail.com> | 2014-09-02 08:58:09 +0200 |
| commit | cc1866eacb1a19b1d57f4737123721e797c9d9b1 (patch) | |
| tree | e718e5bdffd99d5bef6948897eaf95cc46567864 /pkgs/applications/graphics/processing | |
| parent | 416b20fbd5d44aea8ff76677ebf2e5ea36827724 (diff) | |
| download | nixpkgs-cc1866eacb1a19b1d57f4737123721e797c9d9b1.tar nixpkgs-cc1866eacb1a19b1d57f4737123721e797c9d9b1.tar.gz nixpkgs-cc1866eacb1a19b1d57f4737123721e797c9d9b1.tar.bz2 nixpkgs-cc1866eacb1a19b1d57f4737123721e797c9d9b1.tar.lz nixpkgs-cc1866eacb1a19b1d57f4737123721e797c9d9b1.tar.xz nixpkgs-cc1866eacb1a19b1d57f4737123721e797c9d9b1.tar.zst nixpkgs-cc1866eacb1a19b1d57f4737123721e797c9d9b1.zip | |
processing: apply patch from IRC to make it work without the IDE too
Diffstat (limited to 'pkgs/applications/graphics/processing')
| -rw-r--r-- | pkgs/applications/graphics/processing/default.nix | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index 7d0595134e9..ecce0e260bb 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 }: +{ fetchurl, stdenv, ant, jre, makeWrapper, libXxf86vm, which }: stdenv.mkDerivation rec { name = "processing-${version}"; @@ -12,20 +12,21 @@ stdenv.mkDerivation rec { # Stop it trying to download its own version of java patches = [ ./use-nixpkgs-jre.patch ]; - buildInputs = [ ant jre makeWrapper libXxf86vm ]; + buildInputs = [ ant jre makeWrapper libXxf86vm which ]; buildPhase = "cd build && ant build"; installPhase = '' + mkdir -p $out/${name} mkdir -p $out/bin - cp -r linux/work/* $out/ - sed -e "s#APPDIR=\`dirname \"\$APPDIR\"\`#APPDIR=$out#" -i $out/processing - sed -e "s#APPDIR=\`dirname \"\$APPDIR\"\`#APPDIR=$out#" -i $out/processing-java - mv $out/processing{,-java} $out/bin/ - wrapProgram $out/bin/processing --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib - wrapProgram $out/bin/processing-java --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib - mkdir $out/java - ln -s ${jre}/bin $out/java/ + cp -r linux/work/* $out/${name}/ + makeWrapper $out/${name}/processing $out/bin/processing \ + --prefix PATH : "${jre}/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 LD_LIBRARY_PATH : ${libXxf86vm}/lib + ln -s ${jre} $out/${name}/java ''; meta = with stdenv.lib; { |