treewide: use stripJavaArchivesHook instead of canonicalize-jars-hook

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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