diff options
| author | taku0 <mxxouy6x3m_github@tatapa.org> | 2019-01-23 20:52:02 +0900 |
|---|---|---|
| committer | taku0 <mxxouy6x3m_github@tatapa.org> | 2019-01-23 20:52:02 +0900 |
| commit | 3a99772d07a8d4a88dc2ad4fe7e5954bf276abd8 (patch) | |
| tree | 58b4427120145a1ba78f0a423a33b92e346ffa95 /pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix | |
| parent | 04f025a8d4d123084eef91c9bae8e5314d85fcbb (diff) | |
| download | nixpkgs-3a99772d07a8d4a88dc2ad4fe7e5954bf276abd8.tar nixpkgs-3a99772d07a8d4a88dc2ad4fe7e5954bf276abd8.tar.gz nixpkgs-3a99772d07a8d4a88dc2ad4fe7e5954bf276abd8.tar.bz2 nixpkgs-3a99772d07a8d4a88dc2ad4fe7e5954bf276abd8.tar.lz nixpkgs-3a99772d07a8d4a88dc2ad4fe7e5954bf276abd8.tar.xz nixpkgs-3a99772d07a8d4a88dc2ad4fe7e5954bf276abd8.tar.zst nixpkgs-3a99772d07a8d4a88dc2ad4fe7e5954bf276abd8.zip | |
adoptopenjdk: 11.0.1 -> 11.0.2 (x86_64-linux only)
Diffstat (limited to 'pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix')
| -rw-r--r-- | pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index 958f36d3928..7b16d6ad9db 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -5,13 +5,14 @@ sourcePerArch: , fetchurl }: -let result = stdenv.mkDerivation rec { +let cpuName = stdenv.hostPlatform.parsed.cpu.name; + result = stdenv.mkDerivation rec { name = if sourcePerArch.packageType == "jdk" - then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}" - else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"; + then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}" + else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"; src = fetchurl { - inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256; + inherit (sourcePerArch.${cpuName}) url sha256; }; # See: https://github.com/NixOS/patchelf/issues/10 |