diff options
| author | Marek Mahut <marek.mahut@gmail.com> | 2019-08-19 08:43:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-19 08:43:13 +0200 |
| commit | 9541c6b7bf0c2ce78633fd27498121ef28975881 (patch) | |
| tree | 53634dd37726d3d045cea4f5817ebf2a9bfbb36a /pkgs/applications/graphics | |
| parent | 374e0ad0a844394a4b5c34dd2cff01f7fe062a18 (diff) | |
| parent | 939cd1bf4c1a9eb633870d76b192e5440429e0c5 (diff) | |
| download | nixpkgs-9541c6b7bf0c2ce78633fd27498121ef28975881.tar nixpkgs-9541c6b7bf0c2ce78633fd27498121ef28975881.tar.gz nixpkgs-9541c6b7bf0c2ce78633fd27498121ef28975881.tar.bz2 nixpkgs-9541c6b7bf0c2ce78633fd27498121ef28975881.tar.lz nixpkgs-9541c6b7bf0c2ce78633fd27498121ef28975881.tar.xz nixpkgs-9541c6b7bf0c2ce78633fd27498121ef28975881.tar.zst nixpkgs-9541c6b7bf0c2ce78633fd27498121ef28975881.zip | |
Merge pull request #66740 from lopsided98/processing-update
processing: 3.4 -> 3.5.3
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/processing/default.nix (renamed from pkgs/applications/graphics/processing3/default.nix) | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing/default.nix index 6f90131db12..9972ea75709 100644 --- a/pkgs/applications/graphics/processing3/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - version = "3.4"; - name = "processing3-${version}"; + pname = "processing"; + version = "3.5.3"; src = fetchFromGitHub { owner = "processing"; repo = "processing"; - rev = "processing-0265-${version}"; - sha256 = "12wpxgn2wd5vbasx9584w5yb1s319smq1zh8m7dvp7gkqw9plwp4"; + rev = "processing-0269-${version}"; + sha256 = "0ajniy3a0i0rx7is46r85yh3ah4zm4ra1gbllmihw9pmnfjgfajn"; }; nativeBuildInputs = [ ant rsync makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ${xmlstarlet}/bin/xmlstarlet ed --inplace -P -d '//get[@src="http://download.processing.org/reference.zip"]' build/build.xml install -D -m0444 ${fetchurl { url = http://download.processing.org/reference.zip; - sha256 = "0ai0cr62gc7n6y22ki3qibyj1qnlaxv1miqxmmahfk3hpbyfqz9n"; + sha256 = "198bpk8mzns6w5h0zdf50wr6iv7sgdi6v7jznj5rbsnpgyilxz35"; } } ./java/reference.zip @@ -39,16 +39,16 @@ stdenv.mkDerivation rec { installPhase = '' mkdir $out - cp -dpR build/linux/work $out/${name} + cp -dpR build/linux/work $out/${pname} - rmdir $out/${name}/java - ln -s ${jdk} $out/${name}/java + rmdir $out/${pname}/java + ln -s ${jdk} $out/${pname}/java - makeWrapper $out/${name}/processing $out/bin/processing \ + makeWrapper $out/${pname}/processing $out/bin/processing \ --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \ --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib - makeWrapper $out/${name}/processing-java $out/bin/processing-java \ + makeWrapper $out/${pname}/processing-java $out/bin/processing-java \ --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \ --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib |