pyrox.dev
Merge pull request #162389 from Stunkymonkey/adoptopenjdk-bin-pname-version
+4
-3
pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
+4
-3
pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
···
10
10
11
11
let cpuName = stdenv.hostPlatform.parsed.cpu.name;
12
12
result = stdenv.mkDerivation {
13
-
name = if sourcePerArch.packageType == "jdk"
14
-
then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"
15
-
else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}";
13
+
pname = if sourcePerArch.packageType == "jdk"
14
+
then "adoptopenjdk-${sourcePerArch.vmType}-bin"
15
+
else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin";
16
+
version = sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}");
16
17
17
18
src = fetchurl {
18
19
inherit (sourcePerArch.${cpuName}) url sha256;
+3
-3
pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+3
-3
pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
···
33
33
in
34
34
35
35
let result = stdenv.mkDerivation rec {
36
-
name = if sourcePerArch.packageType == "jdk"
37
-
then "adoptopenjdk-${sourcePerArch.vmType}-bin-${version}"
38
-
else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${version}";
36
+
pname = if sourcePerArch.packageType == "jdk"
37
+
then "adoptopenjdk-${sourcePerArch.vmType}-bin"
38
+
else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin";
39
39
40
40
version = sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}");
41
41