cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #297566 from TomaSajt/use-strip-java-archives

Browse source 
treewide: use stripJavaArchivesHook in trivial cases
This commit is contained in:
Aleksana 2024-04-27 15:43:08 +08:00 committed by GitHub
commit 9d3911e286
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, jogl, rsync, ffmpeg, batik, wrapGAppsHook, libGL }:
{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, jogl, rsync, ffmpeg, batik, stripJavaArchivesHook, wrapGAppsHook, libGL }:
let
buildNumber = "1293";
vaqua = fetchurl {
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-SzQemZ6iZ9o89/doV8YMv7DmyPSDyckJl3oyxJyfrm0=";
};
nativeBuildInputs = [ ant unzip makeWrapper wrapGAppsHook ];
nativeBuildInputs = [ ant unzip makeWrapper stripJavaArchivesHook wrapGAppsHook ];
buildInputs = [ jdk jogl ant rsync ffmpeg batik ];
dontWrapGApps = true;

3
pkgs/applications/misc/sweethome3d/default.nix
View file

@ -6,6 +6,7 @@
, makeDesktopItem
, jdk
, ant
, stripJavaArchivesHook
, gtk3
, gsettings-desktop-schemas
, p7zip
@ -51,7 +52,7 @@ let
find . -name '*.so' | xargs strings | { grep '/nix/store' || :; } >> ./.jar-paths
'';
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
nativeBuildInputs = [ makeWrapper autoPatchelfHook stripJavaArchivesHook ];
buildInputs = [ ant jdk p7zip gtk3 gsettings-desktop-schemas libXxf86vm ];
# upstream targets Java 7 by default

3
pkgs/applications/misc/sweethome3d/editors.nix
View file

@ -5,6 +5,7 @@
, makeDesktopItem
, jdk
, ant
, stripJavaArchivesHook
, gtk3
, gsettings-desktop-schemas
, sweethome3dApp
@ -33,7 +34,7 @@ let
categories = [ "Graphics" "2DGraphics" "3DGraphics" ];
};
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper stripJavaArchivesHook ];
buildInputs = [ ant jdk gtk3 gsettings-desktop-schemas ];
# upstream targets Java 7 by default

2
pkgs/by-name/op/openrocket/package.nix
View file

@ -4,6 +4,7 @@
, ant
, jdk17
, makeWrapper
, stripJavaArchivesHook
}:
let
@ -25,6 +26,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
ant
jdk
makeWrapper
stripJavaArchivesHook
];
buildPhase = ''

3
pkgs/development/embedded/arduino/arduino-core/default.nix
View file

@ -4,6 +4,7 @@
, fetchurl
, jdk
, ant
, stripJavaArchivesHook
, libusb-compat-0_1
, libusb1
, unzip
@ -112,7 +113,7 @@ stdenv.mkDerivation rec {
# the glib setup hook will populate GSETTINGS_SCHEMAS_PATH,
# wrapGAppHooks (among other things) adds it to XDG_DATA_DIRS
# so 'save as...' works:
nativeBuildInputs = [ glib wrapGAppsHook unzip ];
nativeBuildInputs = [ glib stripJavaArchivesHook wrapGAppsHook unzip ];
buildInputs = [
jdk
ant

3
pkgs/tools/filesystems/xtreemfs/default.nix
View file

@ -3,6 +3,7 @@
, fetchFromGitHub
, fetchpatch
, makeWrapper
, stripJavaArchivesHook
, ant
, attr
, boost
@ -28,7 +29,7 @@ stdenv.mkDerivation {
sha256 = "1hjmd32pla27zf98ghzz6r5ml8ry86m9dsryv1z01kxv5l95b3m0";
};
nativeBuildInputs = [ makeWrapper python3 ];
nativeBuildInputs = [ makeWrapper python3 stripJavaArchivesHook ];
buildInputs = [ which attr ];
patches = [