Unverified Commit cc43d0e3 authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

javaPackages.compilers: fix eval (#397060)

parents fcec87c2 0f1c7f59
Loading
Loading
Loading
Loading
+12 −4
Original line number Diff line number Diff line
@@ -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
      );