colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 let
buildNumber = "1293"; buildNumber = "1293";
vaqua = fetchurl { vaqua = fetchurl {
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-SzQemZ6iZ9o89/doV8YMv7DmyPSDyckJl3oyxJyfrm0="; sha256 = "sha256-SzQemZ6iZ9o89/doV8YMv7DmyPSDyckJl3oyxJyfrm0=";
}; };
nativeBuildInputs = [ ant unzip makeWrapper wrapGAppsHook ]; nativeBuildInputs = [ ant unzip makeWrapper stripJavaArchivesHook wrapGAppsHook ];
buildInputs = [ jdk jogl ant rsync ffmpeg batik ]; buildInputs = [ jdk jogl ant rsync ffmpeg batik ];
dontWrapGApps = true; dontWrapGApps = true;

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

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

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

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

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

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

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

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

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

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