about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2023-08-03 13:34:34 +0200
committerWeijia Wang <9713184+wegank@users.noreply.github.com>2023-08-03 15:33:11 +0200
commit3b438ab99e650720eb710e53bc988b7a8fd29c10 (patch)
tree7c3dc60556261c89c72e9353bedf5d740c23f72c
parentf5672f753b300822390dec63b24684eac5a0a057 (diff)
javaPackages.jogl_2_3_2: drop
-rw-r--r--pkgs/development/java-modules/jogl/default.nix67
-rw-r--r--pkgs/top-level/java-packages.nix1
2 files changed, 0 insertions, 68 deletions
diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix
index 3373dc2176701..b090ec96586af 100644
--- a/pkgs/development/java-modules/jogl/default.nix
+++ b/pkgs/development/java-modules/jogl/default.nix
@@ -79,71 +79,4 @@
         platforms = platforms.linux;
       };
     };
-
-  jogl_2_3_2 =
-    let
-      version = "2.3.2";
-
-      gluegen-src = fetchgit {
-        url = "git://jogamp.org/srv/scm/gluegen.git";
-        rev = "v${version}";
-        sha256 = "00hybisjwqs88p24dds652bzrwbbmhn2dpx56kp4j6xpadkp33d0";
-        fetchSubmodules = true;
-      };
-    in stdenv.mkDerivation {
-      pname = "jogl";
-      inherit version;
-
-      src = fetchgit {
-        url = "git://jogamp.org/srv/scm/jogl.git";
-        rev = "v${version}";
-        sha256 = "0msi2gxiqm2yqwkmxqbh521xdrimw1fly20g890r357rcgj8fsn3";
-        fetchSubmodules = true;
-      };
-
-      postPatch = ''
-        find  .  -type f  -name '*.java' \
-          -exec sed -i 's@"libGL.so"@"${libGL}/lib/libGL.so"@'    {} \; \
-          -exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \;
-      '';
-
-      # TODO: upgrade to jdk https://github.com/NixOS/nixpkgs/pull/89731
-      nativeBuildInputs = [ jdk8 ant git ];
-      buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
-
-      # 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
-      env.NIX_CFLAGS_COMPILE = "-fcommon";
-
-      buildPhase = ''
-        cp -r ${gluegen-src} $NIX_BUILD_TOP/gluegen
-        chmod -R +w $NIX_BUILD_TOP/gluegen
-        ( cd ../gluegen/make
-          ant )
-
-        ( cd make
-
-          # 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
-          cp build-newt.xml build-newt.xml.old
-          fgrep -v 'if="setup.addNativeBroadcom"' build-newt.xml.old > build-newt.xml
-
-          ant )
-      '';
-
-      installPhase = ''
-        mkdir -p $out/share/java
-        cp $NIX_BUILD_TOP/gluegen/build/gluegen-rt{,-natives-linux-amd64}.jar $out/share/java/
-        cp $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-amd64}.jar  $out/share/java/
-      '';
-
-      meta = with lib; {
-        description = "Java libraries for 3D Graphics, Multimedia and Processing";
-        homepage = "https://jogamp.org/";
-        license = licenses.bsd3;
-        platforms = [ "x86_64-linux" ];
-      };
-    };
 }
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index 7439ba7892fbe..b004d4e7fc624 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -224,6 +224,5 @@ in {
   };
 
   inherit (callPackage ../development/java-modules/jogl { })
-    jogl_2_3_2
     jogl_2_4_0;
 }