fix missing dependencies

pcasaretto · Mar 1, 2024 · f82ab17 · f82ab17
1 parent 8e1791b
commit f82ab17
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/pkgs/development/compilers/corretto/17.nix b/pkgs/development/compilers/corretto/17.nix
@@ -9,11 +9,15 @@
 , testers
 , which
 , xcbuild
+, zip
+, coreutils
+, xattr
+, setfile
 }:
 
 let
   corretto = import ./mk-corretto.nix {
-    inherit lib stdenv autoconf rsync runCommand testers which xcbuild;
+    inherit lib stdenv autoconf rsync runCommand testers which xcbuild zip coreutils xattr setfile;
     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
@@ -10,6 +10,10 @@
 , testers
 , which
 , xcbuild
+, zip
+, coreutils
+, xattr
+, setfile
 }:
 
 # Each Corretto version is based on a corresponding OpenJDK version. So
@@ -29,9 +33,8 @@ jdk.overrideAttrs (finalAttrs: oldAttrs: {
   inherit pname version src;
   name = "${pname}-${version}";
 
-  nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ jdk gradle rsync ] ++ lib.optionals stdenv.isDarwin [ autoconf which xcbuild ];
+  nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ jdk gradle rsync ] ++ lib.optionals stdenv.isDarwin [ coreutils zip autoconf which xcbuild xattr setfile ];
 
-  # dontConfigure = true;
   configurePhase = ''
     runHook preConfigure
 

diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
@@ -96,7 +96,10 @@ in {
       ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix;
 
     corretto11 = callPackage ../development/compilers/corretto/11.nix { };
-    corretto17 = callPackage ../development/compilers/corretto/17.nix { };
+    corretto17 = callPackage ../development/compilers/corretto/17.nix {
+      xattr=darwin.xattr;
+      setfile=darwin.stubs.setfile;
+    };
     corretto19 = callPackage ../development/compilers/corretto/19.nix { };
 
     openjdk8-bootstrap = mkBootstrap adoptopenjdk-8