Unverified Commit 9d3911e2 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

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

treewide: use stripJavaArchivesHook in trivial cases
parents cb48c117 4fc417df

pkgs/applications/graphics/processing/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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;

pkgs/applications/misc/sweethome3d/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -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

pkgs/applications/misc/sweethome3d/editors.nix

+2 −1
Original line number Diff line number Diff line
@@ -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

pkgs/by-name/op/openrocket/package.nix

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
, ant

, jdk17

, makeWrapper

, stripJavaArchivesHook

}:



let
@@ -25,6 +26,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
    ant

    jdk

    makeWrapper

    stripJavaArchivesHook

  ];



  buildPhase = ''

pkgs/development/embedded/arduino/arduino-core/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -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