diff options
| author | Aleksana <me@aleksana.moe> | 2024-04-27 15:43:08 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-27 15:43:08 +0800 |
| commit | 9d3911e28686eae1dbbdadf6c5e6c260845c7be0 (patch) | |
| tree | 5cfba01ffd6bd83ab9653c5ff26dd13f860b9ec7 /pkgs/applications/misc/sweethome3d | |
| parent | cb48c117428ac93699887cb916cd5cb0e954d59f (diff) | |
| parent | 4fc417df2543c34626801bbd55b48645bf75ce1b (diff) | |
Merge pull request #297566 from TomaSajt/use-strip-java-archives
treewide: use stripJavaArchivesHook in trivial cases
Diffstat (limited to 'pkgs/applications/misc/sweethome3d')
| -rw-r--r-- | pkgs/applications/misc/sweethome3d/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/misc/sweethome3d/editors.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index bc429817d55ae..4745a942304ad 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 f4fe14fb6751b..a426494b61f64 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 |