diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2023-04-11 10:38:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-11 10:38:08 +0200 |
commit | 92c5308ed3986d49e13e014bb48fc25f496e7df9 (patch) | |
tree | f89dcb9b70ca359a4965a62abebc7623840b494d | |
parent | 2fb1affc01d61aa06393dbcccc7c6e467ff700e8 (diff) | |
parent | 21c659d543f764a3274a10cc5ffd4e0603df6a1e (diff) |
Merge pull request #224673 from figsoda/jdk
javaPackages.compiler.openjdk15: fix eval
-rw-r--r-- | pkgs/development/compilers/openjdk/15.nix | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix index b0401b03faceb..73d022c9fd91a 100644 --- a/pkgs/development/compilers/openjdk/15.nix +++ b/pkgs/development/compilers/openjdk/15.nix @@ -9,16 +9,19 @@ }: let - major = "15"; - update = ".0.1"; - build = "-ga"; + version = { + major = "15"; + update = ".0.1"; + build = "-ga"; + __toString = self: "${self.major}${self.update}${self.build}"; + }; - openjdk = stdenv.mkDerivation rec { + openjdk = stdenv.mkDerivation { pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${major}${update}${build}"; + inherit version; src = fetchurl { - url = "https://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; + url = "https://hg.openjdk.java.net/jdk-updates/jdk${version.major}u/archive/jdk-${version}.tar.gz"; sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l"; }; @@ -149,8 +152,8 @@ let disallowedReferences = [ openjdk15-bootstrap ]; - pos = builtins.unsafeGetAttrPos "feature" version; - meta = import ./meta.nix lib version; + pos = builtins.unsafeGetAttrPos "major" version; + meta = import ./meta.nix lib version.major; passthru = { architecture = ""; |