diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-02-10 18:00:38 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-02-10 18:00:38 +0100 |
| commit | b95f9bd48cbb8a1b33c815bfcfebd2fce5b0175b (patch) | |
| tree | 377ae5fb0eab6b3f296f4d6c5027cbf872cd6449 /pkgs/applications | |
| parent | e0151287665f9522a417ad317c07d79731a38a4d (diff) | |
javaPackages.jogl_2_4_0: rename to jogl
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/processing/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/science/misc/gephi/default.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index 54d6723f74270..65cd2bea47709 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, javaPackages, rsync, ffmpeg, batik, gsettings-desktop-schemas, xorg, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, jogl, rsync, ffmpeg, batik, wrapGAppsHook }: let buildNumber = "1293"; vaqua = fetchurl { @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ant unzip makeWrapper wrapGAppsHook ]; - buildInputs = [ jdk javaPackages.jogl_2_4_0 ant rsync ffmpeg batik ]; + buildInputs = [ jdk jogl ant rsync ffmpeg batik ]; dontWrapGApps = true; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { tar --checkpoint=10000 -czf build/linux/jdk-17.0.8-${arch}.tgz ${jdk} cp ${ant}/lib/ant/lib/{ant.jar,ant-launcher.jar} app/lib/ mkdir -p core/library - ln -s ${javaPackages.jogl_2_4_0}/share/java/* core/library/ + ln -s ${jogl}/share/java/* core/library/ ln -s ${vaqua} app/lib/VAqua9.jar ln -s ${flatlaf} app/lib/flatlaf.jar ln -s ${lsp4j} java/mode/org.eclipse.lsp4j.jar diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index a08f5da441fc3..22c453dbab301 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, jdk11, maven, javaPackages }: +{ lib, fetchFromGitHub, jdk11, maven, jogl }: let mavenJdk11 = maven.override { @@ -29,8 +29,8 @@ mavenJdk11.buildMavenPackage rec { # use self-compiled JOGL to avoid patchelf'ing .so inside jars rm $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-{jogl,gluegen}/*.jar - cp ${javaPackages.jogl_2_4_0}/share/java/jogl*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-jogl/ - cp ${javaPackages.jogl_2_4_0}/share/java/glue*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-gluegen/ + cp ${jogl}/share/java/jogl*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-jogl/ + cp ${jogl}/share/java/glue*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-gluegen/ printf "\n\njdkhome=${jdk11}\n" >> $out/etc/gephi.conf ''; |