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

treewide: use stripJavaArchivesHook instead of canonicalize-jars-hook

Browse Source
This commit is contained in:
TomaSajt 2024-03-17 13:35:12 +01:00
parent 48285f7169
commit 0e20953796
No known key found for this signature in database
GPG Key ID: F011163C050122A1
14 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/calcoo/default.nix
View File

@ -2,7 +2,7 @@
, stdenv
, fetchzip
, ant
, canonicalize-jars-hook
, stripJavaArchivesHook
, jdk
, makeWrapper
}:
@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
ant
canonicalize-jars-hook
stripJavaArchivesHook
jdk
makeWrapper
];

4
pkgs/applications/misc/pattypan/default.nix
View File

@ -7,7 +7,7 @@
, wrapGAppsHook
, makeDesktopItem
, copyDesktopItems
, canonicalize-jars-hook
, stripJavaArchivesHook
}:
stdenv.mkDerivation (finalAttrs: {
@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
makeWrapper
wrapGAppsHook
copyDesktopItems
canonicalize-jars-hook
stripJavaArchivesHook
];
dontWrapGApps = true;

4
pkgs/applications/networking/remote/dayon/default.nix
View File

@ -6,7 +6,7 @@
, jre
, makeWrapper
, copyDesktopItems
, canonicalize-jars-hook
, stripJavaArchivesHook
}:
stdenv.mkDerivation (finalAttrs: {
@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
jdk
makeWrapper
copyDesktopItems
canonicalize-jars-hook
stripJavaArchivesHook
];
buildPhase = ''

4
pkgs/applications/science/biology/trimmomatic/default.nix
View File

@ -5,7 +5,7 @@
, jdk
, jre
, makeWrapper
, canonicalize-jars-hook
, stripJavaArchivesHook
}:
stdenv.mkDerivation (finalAttrs: {
@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
ant
jdk
makeWrapper
canonicalize-jars-hook
stripJavaArchivesHook
];
buildPhase = ''

4
pkgs/development/compilers/abcl/default.nix
View File

@ -6,7 +6,7 @@
, jdk
, jre
, makeWrapper
, canonicalize-jars-hook
, stripJavaArchivesHook
}:
let
@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
jdk
fakeHostname
makeWrapper
canonicalize-jars-hook
stripJavaArchivesHook
];
buildPhase = ''

4
pkgs/development/compilers/jasmin/default.nix
View File

@ -5,7 +5,7 @@
, ant
, jdk8
, makeWrapper
, canonicalize-jars-hook
, stripJavaArchivesHook
, callPackage
}:
@ -27,7 +27,7 @@ in stdenv.mkDerivation (finalAttrs: {
ant
jdk
makeWrapper
canonicalize-jars-hook
stripJavaArchivesHook
];
buildPhase = ''

4
pkgs/development/libraries/java/cup/default.nix
View File

@ -4,7 +4,7 @@
, ant
, jdk
, makeWrapper
, canonicalize-jars-hook
, stripJavaArchivesHook
}:
stdenv.mkDerivation (finalAttrs: {
@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
ant
jdk
makeWrapper
canonicalize-jars-hook
stripJavaArchivesHook
];
buildPhase = ''

4
pkgs/development/libraries/java/hydra-ant-logger/default.nix
View File

@ -3,7 +3,7 @@
, fetchFromGitHub
, ant
, jdk
, canonicalize-jars-hook
, stripJavaArchivesHook
}:
stdenv.mkDerivation {
@ -20,7 +20,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [
ant
jdk
canonicalize-jars-hook
stripJavaArchivesHook
];
buildPhase = ''

4
pkgs/development/libraries/java/swt/default.nix
View File

@ -1,6 +1,6 @@
{ lib
, stdenv
, canonicalize-jars-hook
, stripJavaArchivesHook
, fetchzip
, pkg-config
, atk
@ -58,7 +58,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [
canonicalize-jars-hook
stripJavaArchivesHook
pkg-config
];
buildInputs = [

4
pkgs/development/tools/analysis/jdepend/default.nix
View File

@ -4,7 +4,7 @@
, ant
, jdk
, makeWrapper
, canonicalize-jars-hook
, stripJavaArchivesHook
}:
stdenv.mkDerivation (finalAttrs: {
@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
ant
jdk
makeWrapper
canonicalize-jars-hook
stripJavaArchivesHook
];
buildPhase = ''

4
pkgs/development/tools/parsing/javacc/default.nix
View File

@ -5,7 +5,7 @@
, jdk
, jre
, makeWrapper
, canonicalize-jars-hook
, stripJavaArchivesHook
}:
stdenv.mkDerivation (finalAttrs: {
@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
ant
jdk
makeWrapper
canonicalize-jars-hook
stripJavaArchivesHook
];
buildPhase = ''

4
pkgs/games/prismlauncher/default.nix
View File

@ -1,7 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, canonicalize-jars-hook
, stripJavaArchivesHook
, cmake
, cmark
, Cocoa
@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-4VsoxZzi/EfEsnDvvwzg2xhj7j5B+k3gvaSqwJFDweE=";
};
nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja canonicalize-jars-hook ];
nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja stripJavaArchivesHook ];
buildInputs =
[
qtbase

4
pkgs/tools/games/jpsxdec/default.nix
View File

@ -7,7 +7,7 @@
, makeWrapper
, makeDesktopItem
, copyDesktopItems
, canonicalize-jars-hook
, stripJavaArchivesHook
}:
stdenv.mkDerivation (finalAttrs: {
@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
jdk8
makeWrapper
copyDesktopItems
canonicalize-jars-hook
stripJavaArchivesHook
];
buildPhase = ''

4
pkgs/tools/misc/ili2c/default.nix
View File

@ -5,7 +5,7 @@
, jdk8
, jre8
, makeWrapper
, canonicalize-jars-hook
, stripJavaArchivesHook
}:
let
@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
ant
jdk
makeWrapper
canonicalize-jars-hook
stripJavaArchivesHook
];
src = fetchFromGitHub {