BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #287641 from wegank/jogl-rename

Browse source 
javaPackages.jogl_2_4_0: rename to jogl
This commit is contained in:
Weijia Wang 2024-02-10 21:34:56 +01:00 committed by GitHub
commit 7c66bc81f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 129 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/graphics/processing/default.nix
View file

@ -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

6
pkgs/applications/science/misc/gephi/default.nix
View file

@ -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
'';

118
pkgs/by-name/jo/jogl/package.nix Normal file
View file

@ -0,0 +1,118 @@
{ lib
, stdenv
, fetchgit
, ant
, jdk11
, git
, xmlstarlet
, xcbuild
, udev
, xorg
, mesa
, darwin
, coreutils
}:
let
version = "2.4.0";
gluegen-src = fetchgit {
url = "git://jogamp.org/srv/scm/gluegen.git";
rev = "v${version}";
hash = "sha256-qQzq7v2vMFeia6gXaNHS3AbOp9HhDRgISp7P++CKErA=";
fetchSubmodules = true;
};
jogl-src = fetchgit {
url = "git://jogamp.org/srv/scm/jogl.git";
rev = "v${version}";
hash = "sha256-PHDq7uFEQfJ2P0eXPUi0DGFR1ob/n5a68otgzpFnfzQ=";
fetchSubmodules = true;
};
in
stdenv.mkDerivation {
pname = "jogl";
inherit version;
srcs = [ gluegen-src jogl-src ];
sourceRoot = ".";
unpackCmd = "cp -r $curSrc \${curSrc##*-}";
postPatch = lib.optionalString stdenv.isDarwin ''
sed -i '/if="use.macos/d' gluegen/make/gluegen-cpptasks-base.xml
rm -r jogl/oculusvr-sdk
'';
nativeBuildInputs = [
ant
jdk11
git
xmlstarlet
] ++ lib.optionals stdenv.isDarwin [
xcbuild
];
buildInputs = lib.optionals stdenv.isLinux [
udev
xorg.libX11
xorg.libXrandr
xorg.libXcursor
xorg.libXi
xorg.libXt
xorg.libXxf86vm
xorg.libXrender
mesa
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk_11_0.frameworks.AppKit
darwin.apple_sdk_11_0.frameworks.Cocoa
];
# Workaround build failure on -fno-common toolchains:
# ld: ../obj/Bindingtest1p1Impl_JNI.o:(.bss+0x8): multiple definition of
# `unsigned_size_t_1'; ../obj/TK_Surface_JNI.o:(.bss+0x8): first defined here
NIX_CFLAGS_COMPILE = "-fcommon"; # copied from 2.3.2, is this still needed?
buildPhase = ''
( cd gluegen/make
substituteInPlace ../src/java/com/jogamp/common/util/IOUtil.java --replace '#!/bin/true' '#!${coreutils}/bin/true'
# set timestamp of files in jar to a fixed point in time
xmlstarlet ed --inplace \
--append //jar --type attr -n modificationtime --value 1980-01-01T00:00Z \
build.xml gluegen-cpptasks-base.xml
ant -Dtarget.sourcelevel=8 -Dtarget.targetlevel=8 -Dtarget.rt.jar='null.jar' )
( cd jogl/make
# prevent looking for native libraries in /usr/lib
substituteInPlace build-*.xml \
--replace 'dir="''${TARGET_PLATFORM_USRLIBS}"' ""
# force way to do disfunctional "ant -Dsetup.addNativeBroadcom=false" and disable dependency on raspberrypi drivers
# if arm/aarch64 support will be added, this block might be commented out on those platforms
# on x86 compiling with default "setup.addNativeBroadcom=true" leads to unsatisfied import "vc_dispmanx_resource_delete" in libnewt.so
xmlstarlet ed --inplace --delete '//*[@if="setup.addNativeBroadcom"]' build-newt.xml
# set timestamp of files in jar to a fixed point in time
xmlstarlet ed --inplace \
--append //jar --type attr -n modificationtime --value 1980-01-01T00:00Z \
build.xml build-nativewindow.xml build-jogl.xml
ant -Dtarget.sourcelevel=8 -Dtarget.targetlevel=8 -Dtarget.rt.jar='null.jar' )
'';
installPhase = ''
mkdir -p $out/share/java
cp -v $NIX_BUILD_TOP/gluegen/build/gluegen-rt{,-natives-linux-*}.jar $out/share/java/
cp -v $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-*}.jar $out/share/java/
cp -v $NIX_BUILD_TOP/jogl/build/nativewindow/nativewindow{,-awt,-natives-linux-*,-os-drm,-os-x11}.jar $out/share/java/
'';
meta = with lib; {
description = "Java libraries for 3D Graphics, Multimedia and Processing";
homepage = "https://jogamp.org/";
license = licenses.bsd3;
platforms = platforms.all;
};
}

89
pkgs/development/java-modules/jogl/default.nix
View file

@ -1,89 +0,0 @@
{ coreutils, lib, stdenv, fetchgit, ant, jdk8, jdk11, git, xorg, udev, libGL, libGLU, mesa, xmlstarlet, xcbuild, darwin }:
{
jogl_2_4_0 =
let
version = "2.4.0";
gluegen-src = fetchgit {
url = "git://jogamp.org/srv/scm/gluegen.git";
rev = "v${version}";
hash = "sha256-qQzq7v2vMFeia6gXaNHS3AbOp9HhDRgISp7P++CKErA=";
fetchSubmodules = true;
};
jogl-src = fetchgit {
url = "git://jogamp.org/srv/scm/jogl.git";
rev = "v${version}";
hash = "sha256-PHDq7uFEQfJ2P0eXPUi0DGFR1ob/n5a68otgzpFnfzQ=";
fetchSubmodules = true;
};
in
stdenv.mkDerivation {
pname = "jogl";
inherit version;
srcs = [ gluegen-src jogl-src ];
sourceRoot = ".";
unpackCmd = "cp -r $curSrc \${curSrc##*-}";
postPatch = lib.optionalString stdenv.isDarwin ''
sed -i '/if="use.macos/d' gluegen/make/gluegen-cpptasks-base.xml
rm -r jogl/oculusvr-sdk
'';
nativeBuildInputs = [ ant jdk11 git xmlstarlet ]
++ lib.optionals stdenv.isDarwin [ xcbuild ];
buildInputs = lib.optionals stdenv.isLinux [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXi xorg.libXt xorg.libXxf86vm xorg.libXrender mesa ]
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit darwin.apple_sdk_11_0.frameworks.Cocoa ];
# Workaround build failure on -fno-common toolchains:
# ld: ../obj/Bindingtest1p1Impl_JNI.o:(.bss+0x8): multiple definition of
# `unsigned_size_t_1'; ../obj/TK_Surface_JNI.o:(.bss+0x8): first defined here
NIX_CFLAGS_COMPILE = "-fcommon"; # copied from 2.3.2, is this still needed?
buildPhase = ''
( cd gluegen/make
substituteInPlace ../src/java/com/jogamp/common/util/IOUtil.java --replace '#!/bin/true' '#!${coreutils}/bin/true'
# set timestamp of files in jar to a fixed point in time
xmlstarlet ed --inplace \
--append //jar --type attr -n modificationtime --value 1980-01-01T00:00Z \
build.xml gluegen-cpptasks-base.xml
ant -Dtarget.sourcelevel=8 -Dtarget.targetlevel=8 -Dtarget.rt.jar='null.jar' )
( cd jogl/make
# prevent looking for native libraries in /usr/lib
substituteInPlace build-*.xml \
--replace 'dir="''${TARGET_PLATFORM_USRLIBS}"' ""
# force way to do disfunctional "ant -Dsetup.addNativeBroadcom=false" and disable dependency on raspberrypi drivers
# if arm/aarch64 support will be added, this block might be commented out on those platforms
# on x86 compiling with default "setup.addNativeBroadcom=true" leads to unsatisfied import "vc_dispmanx_resource_delete" in libnewt.so
xmlstarlet ed --inplace --delete '//*[@if="setup.addNativeBroadcom"]' build-newt.xml
# set timestamp of files in jar to a fixed point in time
xmlstarlet ed --inplace \
--append //jar --type attr -n modificationtime --value 1980-01-01T00:00Z \
build.xml build-nativewindow.xml build-jogl.xml
ant -Dtarget.sourcelevel=8 -Dtarget.targetlevel=8 -Dtarget.rt.jar='null.jar' )
'';
installPhase = ''
mkdir -p $out/share/java
cp -v $NIX_BUILD_TOP/gluegen/build/gluegen-rt{,-natives-linux-*}.jar $out/share/java/
cp -v $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-*}.jar $out/share/java/
cp -v $NIX_BUILD_TOP/jogl/build/nativewindow/nativewindow{,-awt,-natives-linux-*,-os-drm,-os-x11}.jar $out/share/java/
'';
meta = with lib; {
description = "Java libraries for 3D Graphics, Multimedia and Processing";
homepage = "https://jogamp.org/";
license = licenses.bsd3;
platforms = platforms.all;
};
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -9617,6 +9617,10 @@ with pkgs;
go-jira = callPackage ../applications/misc/go-jira { };
jogl = callPackage ../by-name/jo/jogl/package.nix {
stdenv = if stdenv.isDarwin && stdenv.isx86_64 then overrideSDK stdenv "11.0" else stdenv;
};
john = callPackage ../tools/security/john { };
joomscan = callPackage ../tools/security/joomscan { };

4
pkgs/top-level/java-packages.nix
View file

@ -236,10 +236,8 @@ in {
else ../development/compilers/semeru-bin/jdk-darwin.nix
) {});
};
inherit (pkgs.darwin.apple_sdk_11_0.callPackage ../development/java-modules/jogl { })
jogl_2_4_0;
}
// lib.optionalAttrs config.allowAliases {
jogl_2_4_0 = throw "'jogl_2_4_0' is renamed to/replaced by 'jogl'";
mavenfod = throw "'mavenfod' is renamed to/replaced by 'maven.buildMavenPackage'";
}