diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-03-19 05:41:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-19 05:41:08 +0100 |
| commit | 186c3e34a76f6170e01dcd41f25dee8c2c61c7f3 (patch) | |
| tree | 64138e8f3524348a7eca700621966e944062eaca /pkgs/by-name/jo | |
| parent | ced4e31b4a3a96ca7805546c1ffa03f730a356df (diff) | |
| parent | e08f26cdb1e23f47821c32de2d03f8d114289bc0 (diff) | |
Merge pull request #296549 from TomaSajt/strip-java-archives-hook
add stripJavaArchivesHook and use treewide
Diffstat (limited to 'pkgs/by-name/jo')
| -rw-r--r-- | pkgs/by-name/jo/jogl/package.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/by-name/jo/jogl/package.nix b/pkgs/by-name/jo/jogl/package.nix index 3919ee1e0e0f0..5157fe6797713 100644 --- a/pkgs/by-name/jo/jogl/package.nix +++ b/pkgs/by-name/jo/jogl/package.nix @@ -5,6 +5,7 @@ , jdk11 , git , xmlstarlet +, stripJavaArchivesHook , xcbuild , udev , xorg @@ -42,13 +43,6 @@ stdenv.mkDerivation { substituteInPlace gluegen/src/java/com/jogamp/common/util/IOUtil.java \ --replace-fail '#!/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 \ - gluegen/make/{build.xml,gluegen-cpptasks-base.xml} \ - jogl/make/{build.xml,build-nativewindow.xml,build-jogl.xml} - '' # prevent looking for native libraries in /usr/lib + '' substituteInPlace jogl/make/build-*.xml \ @@ -72,6 +66,7 @@ stdenv.mkDerivation { jdk11 git xmlstarlet + stripJavaArchivesHook ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; |