diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-07-16 08:21:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-16 08:21:08 +0200 |
| commit | 4d40a0a940db151f4010dc81bf486ec68c3f4ae1 (patch) | |
| tree | c8d356b6e75a794d08d27ccde39ed450122d502b /pkgs/applications | |
| parent | 6e76a618fb5d0033b06b45e64649707c6d38ddae (diff) | |
| parent | 3cf0c5d00713ef6686b3f93bdb7db84ea6863b40 (diff) | |
| download | nixlib-4d40a0a940db151f4010dc81bf486ec68c3f4ae1.tar nixlib-4d40a0a940db151f4010dc81bf486ec68c3f4ae1.tar.gz nixlib-4d40a0a940db151f4010dc81bf486ec68c3f4ae1.tar.bz2 nixlib-4d40a0a940db151f4010dc81bf486ec68c3f4ae1.tar.lz nixlib-4d40a0a940db151f4010dc81bf486ec68c3f4ae1.tar.xz nixlib-4d40a0a940db151f4010dc81bf486ec68c3f4ae1.tar.zst nixlib-4d40a0a940db151f4010dc81bf486ec68c3f4ae1.zip | |
Merge pull request #43527 from volth/patch-188
processing3: fix crash under XFCE, fix build in sandbox
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/processing3/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix index 4ef078fdbac6..803257d93929 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, 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' @@ -37,9 +45,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 ''; |