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

Merge pull request #66740 from lopsided98/processing-update 

processing: 3.4 -> 3.5.3
This commit is contained in:
Marek Mahut 2019-08-19 08:43:13 +02:00 committed by GitHub
parent 374e0ad0a8 939cd1bf4c
commit 9541c6b7bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/graphics/processing3/default.nix → pkgs/applications/graphics/processing/default.nix
View File

@ -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

1
pkgs/top-level/aliases.nix
View File

@ -280,6 +280,7 @@ mapAliases ({
postgis = postgresqlPackages.postgis;
# end
ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream.";
processing3 = processing; # added 2019-08-16
procps-ng = procps; # added 2018-06-08
pulseaudioLight = pulseaudio; # added 2018-04-25
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19

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

@ -20088,8 +20088,7 @@ in
qiv = callPackage ../applications/graphics/qiv { };
processing = processing3;
processing3 = callPackage ../applications/graphics/processing3 {
processing = callPackage ../applications/graphics/processing {
jdk = oraclejdk8;
};