From e3d6f6f202742777e527b55390598ee403b44028 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 14 Jul 2018 15:00:02 +0000 Subject: [PATCH 1/2] processing3: fix crash under XFCE --- pkgs/applications/graphics/processing3/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix index 4ef078fdbac..87566950bfe 100644 --- a/pkgs/applications/graphics/processing3/default.nix +++ b/pkgs/applications/graphics/processing3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm }: +{ stdenv, callPackage, fetchFromGitHub, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "3.3.7"; @@ -37,9 +37,11 @@ stdenv.mkDerivation rec { ln -s ${jdk} $out/${name}/java 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 LD_LIBRARY_PATH : ${libXxf86vm}/lib 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 LD_LIBRARY_PATH : ${libXxf86vm}/lib ''; From 3cf0c5d00713ef6686b3f93bdb7db84ea6863b40 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 15 Jul 2018 23:27:18 +0000 Subject: [PATCH 2/2] processing3: fix sandbox build --- pkgs/applications/graphics/processing3/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix index 87566950bfe..803257d9392 100644 --- a/pkgs/applications/graphics/processing3/default.nix +++ b/pkgs/applications/graphics/processing3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: +{ stdenv, callPackage, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "3.3.7"; @@ -19,6 +19,14 @@ stdenv.mkDerivation rec { rm core/library/*.jar 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 substituteInPlace app/src/processing/app/platform/LinuxPlatform.java \ --replace 'Messages.showWarning' 'if (false) Messages.showWarning'