From e2534cf8e0d58284b5dfbb596b4834d925807279 Mon Sep 17 00:00:00 2001 From: pcasaretto Date: Fri, 1 Mar 2024 15:26:39 -0300 Subject: [PATCH] wip --- pkgs/development/compilers/corretto/17.nix | 5 ++--- .../compilers/corretto/mk-corretto.nix | 19 ++++++++++++++++--- pkgs/top-level/java-packages.nix | 3 +-- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/corretto/17.nix b/pkgs/development/compilers/corretto/17.nix index 558c1e7e675a1..66f8468a4b1dd 100644 --- a/pkgs/development/compilers/corretto/17.nix +++ b/pkgs/development/compilers/corretto/17.nix @@ -11,13 +11,12 @@ , xcbuild , zip , coreutils -, xattr -, setfile +, darwin }: let corretto = import ./mk-corretto.nix { - inherit lib stdenv autoconf rsync runCommand testers which xcbuild zip coreutils xattr setfile; + inherit lib stdenv autoconf rsync runCommand testers which xcbuild zip coreutils darwin; jdk = jdk17; gradle = gradle_7; version = "17.0.8.8.1"; diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix index adcd5efd734a2..49a555d39a435 100644 --- a/pkgs/development/compilers/corretto/mk-corretto.nix +++ b/pkgs/development/compilers/corretto/mk-corretto.nix @@ -12,8 +12,7 @@ , xcbuild , zip , coreutils -, xattr -, setfile +, darwin }: # Each Corretto version is based on a corresponding OpenJDK version. So @@ -28,12 +27,26 @@ let # The version scheme is different between OpenJDK & Corretto. # See https://github.com/corretto/corretto-17/blob/release-17.0.8.8.1/build.gradle#L40 # "major.minor.security.build.revision" + # + appleFrameworks = darwin.apple_sdk_11_0.frameworks; + metalFrameworks = [ + appleFrameworks.Accelerate + appleFrameworks.Metal + appleFrameworks.MetalKit + appleFrameworks.MetalPerformanceShaders + ]; + in jdk.overrideAttrs (finalAttrs: oldAttrs: { inherit pname version src; name = "${pname}-${version}"; - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ jdk gradle rsync ] ++ lib.optionals stdenv.isDarwin [ coreutils zip autoconf which xcbuild xattr setfile ]; + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ jdk gradle rsync ] ++ lib.optionals stdenv.isDarwin + ( + [ coreutils zip autoconf which xcbuild darwin.xattr darwin.stubs.setfile ] + ++ + metalFrameworks + ); configurePhase = '' runHook preConfigure diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 5ce1210172680..fb24984c32572 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -97,8 +97,7 @@ in { corretto11 = callPackage ../development/compilers/corretto/11.nix { }; corretto17 = callPackage ../development/compilers/corretto/17.nix { - xattr=darwin.xattr; - setfile=darwin.stubs.setfile; + darwin=darwin; }; corretto19 = callPackage ../development/compilers/corretto/19.nix { };