diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index 3df5013cc078..5fa438ef975d 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -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; diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index bc429817d55a..4745a942304a 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -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 diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index f4fe14fb6751..a426494b61f6 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -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 diff --git a/pkgs/by-name/op/openrocket/package.nix b/pkgs/by-name/op/openrocket/package.nix index 92b179bd36f2..384d84d9fa45 100644 --- a/pkgs/by-name/op/openrocket/package.nix +++ b/pkgs/by-name/op/openrocket/package.nix @@ -4,6 +4,7 @@ , ant , jdk17 , makeWrapper +, stripJavaArchivesHook }: let @@ -25,6 +26,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ant jdk makeWrapper + stripJavaArchivesHook ]; buildPhase = '' diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix index e82396669787..cf9e014310df 100644 --- a/pkgs/development/embedded/arduino/arduino-core/default.nix +++ b/pkgs/development/embedded/arduino/arduino-core/default.nix @@ -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 diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 6c02117936da..a92369f49841 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -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 = [