Unverified Commit 7ab2c04f authored by Sandro Jäckel's avatar Sandro Jäckel
Browse files

jdk: combine meta.platforms of both packages to fix hydra builds for dependent packages

parent b33a84fd

pkgs/top-level/java-packages.nix

+21 −6
Original line number Diff line number Diff line
@@ -9,13 +9,28 @@ with pkgs; 
    let

      mkOpenjdk =

        featureVersion: path-darwin:

        if stdenv.hostPlatform.isLinux then

          mkOpenjdkLinuxOnly featureVersion

        else

        let

          # merge meta.platforms of both packages so that dependent packages and hydra build them

          mergeMetaPlatforms =

            jdk: other:

            jdk

            // {

              meta = jdk.meta // {

                platforms = lib.unique (jdk.meta.platforms ++ other.meta.platforms);

              };

            };

          openjdkLinux = mkOpenjdkLinuxOnly featureVersion;

          openjdkLinuxHeadless = openjdkLinux.override { headless = true; };

          openjdkDarwin =

            let

              openjdk = callPackage path-darwin { };

            in

          openjdk // { headless = openjdk; };

            openjdk // { headless = mergeMetaPlatforms openjdkDarwin openjdkLinuxHeadless; };

        in

        if stdenv.hostPlatform.isLinux then

          (mergeMetaPlatforms openjdkLinux openjdkDarwin)

        else

          (mergeMetaPlatforms openjdkDarwin openjdkLinux);



      mkOpenjdkLinuxOnly =

        featureVersion:
@@ -25,7 +40,7 @@ with pkgs; 
        assert stdenv.hostPlatform.isLinux;

        openjdk

        // {

          headless = openjdk.override { headless = true; };

          headless = mergeMetaPlatforms openjdkLinuxHeadless openjdkDarwin;

        };



    in