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

Merge pull request #43527 from volth/patch-188

Browse Source 
processing3: fix crash under XFCE, fix build in sandbox
This commit is contained in:
xeji 2018-07-16 08:21:08 +02:00 committed by GitHub
commit 4d40a0a940
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/graphics/processing3/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, callPackage, fetchFromGitHub, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm }: { stdenv, callPackage, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.3.7"; version = "3.3.7";
@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
rm core/library/*.jar rm core/library/*.jar
cp ${javaPackages.jogl_2_3_2}/share/java/*.jar core/library/ cp ${javaPackages.jogl_2_3_2}/share/java/*.jar core/library/
# do not download a file during build
${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 = "104zig026y8vbl4qksmscjq0bms8mi2jmri1ijdlbkxcqnv9bnlf";
}
} ./java/reference.zip
# suppress "Not fond of this Java VM" message box # suppress "Not fond of this Java VM" message box
substituteInPlace app/src/processing/app/platform/LinuxPlatform.java \ substituteInPlace app/src/processing/app/platform/LinuxPlatform.java \
--replace 'Messages.showWarning' 'if (false) Messages.showWarning' --replace 'Messages.showWarning' 'if (false) Messages.showWarning'
@ -37,9 +45,11 @@ stdenv.mkDerivation rec {
ln -s ${jdk} $out/${name}/java ln -s ${jdk} $out/${name}/java
makeWrapper $out/${name}/processing $out/bin/processing \ makeWrapper $out/${name}/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 _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \
--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 XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \
--prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \ --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \
--prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
''; '';