From 0f1c7f59abfa9983e4c3f203734190d120277a55 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 8 Apr 2025 12:16:13 +0200 Subject: [PATCH] javaPackages.compilers: fix eval --- pkgs/top-level/java-packages.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index a2124af1270b..1b2c7126781a 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -57,16 +57,24 @@ with pkgs; temurin-bin = recurseIntoAttrs ( let - temurinLinux = callPackage ../development/compilers/temurin-bin/jdk-linux.nix { }; - temurinDarwin = callPackage ../development/compilers/temurin-bin/jdk-darwin.nix { }; + temurinLinux = import ../development/compilers/temurin-bin/jdk-linux.nix { + inherit (pkgs) lib callPackage stdenv; + }; + temurinDarwin = import ../development/compilers/temurin-bin/jdk-darwin.nix { + inherit (pkgs) lib callPackage; + }; in lib.mapAttrs (name: drv: mkLinuxDarwin drv temurinDarwin.${name}) temurinLinux ); semeru-bin = recurseIntoAttrs ( let - semeruLinux = callPackage ../development/compilers/semeru-bin/jdk-linux.nix { }; - semeruDarwin = callPackage ../development/compilers/semeru-bin/jdk-darwin.nix { }; + semeruLinux = import ../development/compilers/semeru-bin/jdk-linux.nix { + inherit (pkgs) lib callPackage; + }; + semeruDarwin = import ../development/compilers/semeru-bin/jdk-darwin.nix { + inherit (pkgs) lib callPackage; + }; in lib.mapAttrs (name: drv: mkLinuxDarwin drv semeruDarwin.${name}) semeruLinux );