pyrox.dev
Merge pull request #331640 from eljamm/processing
processing: fix build
authored by
GitHub
41afad99
91f13b83
+42
-8
pkgs/applications/graphics/processing/default.nix
+42
-8
pkgs/applications/graphics/processing/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, jogl, rsync, ffmpeg, batik, stripJavaArchivesHook, wrapGAppsHook3, libGL }:
1
+
{
2
+
lib,
3
+
stdenv,
4
+
fetchFromGitHub,
5
+
fetchurl,
6
+
ant,
7
+
unzip,
8
+
makeWrapper,
9
+
jdk,
10
+
jogl,
11
+
rsync,
12
+
ffmpeg,
13
+
batik,
14
+
stripJavaArchivesHook,
15
+
wrapGAppsHook3,
16
+
libGL,
17
+
}:
2
18
let
3
19
buildNumber = "1293";
4
20
vaqua = fetchurl {
···
37
53
sha256 = "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM=";
38
54
};
39
55
40
-
arch = {
41
-
x86_64 = "amd64";
42
-
}.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name;
56
+
arch =
57
+
{
58
+
x86_64 = "amd64";
59
+
}
60
+
.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name;
43
61
in
44
62
stdenv.mkDerivation rec {
45
63
pname = "processing";
···
52
70
sha256 = "sha256-SzQemZ6iZ9o89/doV8YMv7DmyPSDyckJl3oyxJyfrm0=";
53
71
};
54
72
55
-
nativeBuildInputs = [ ant unzip makeWrapper stripJavaArchivesHook wrapGAppsHook3 ];
56
-
buildInputs = [ jdk jogl ant rsync ffmpeg batik ];
73
+
nativeBuildInputs = [
74
+
ant
75
+
unzip
76
+
makeWrapper
77
+
stripJavaArchivesHook
78
+
wrapGAppsHook3
79
+
];
80
+
buildInputs = [
81
+
jdk
82
+
jogl
83
+
ant
84
+
rsync
85
+
ffmpeg
86
+
batik
87
+
];
57
88
58
89
dontWrapGApps = true;
59
90
···
74
105
mv app/lib/{jna-5.10.0/dist/jna.jar,}
75
106
mv app/lib/{jna-5.10.0/dist/jna-platform.jar,}
76
107
ln -sf ${batik}/* java/libraries/svg/library/
77
-
cp java/libraries/svg/library/lib/batik-all-${batik.version}.jar java/libraries/svg/library/batik.jar
108
+
cp java/libraries/svg/library/share/java/batik-all-${batik.version}.jar java/libraries/svg/library/batik.jar
78
109
echo "tarring ffmpeg"
79
110
tar --checkpoint=10000 -czf build/shared/tools/MovieMaker/ffmpeg-5.0.1.gz ${ffmpeg}
80
111
cd build
···
108
139
meta = with lib; {
109
140
description = "Language and IDE for electronic arts";
110
141
homepage = "https://processing.org";
111
-
license = with licenses; [ gpl2Only lgpl21Only ];
142
+
license = with licenses; [
143
+
gpl2Only
144
+
lgpl21Only
145
+
];
112
146
platforms = platforms.linux;
113
147
maintainers = with maintainers; [ evan-goode ];
114
148
};