diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-09-11 15:24:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:14:45 +0000 |
| commit | 89c4dccbd5f33f71808d4b1baafe619696af1162 (patch) | |
| tree | fb1b8d3a2f171164a05d404ab2340cfb1a9d3e21 /nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix | |
| parent | 8920a0e4d962a919238bab69ddc607d7f3396f70 (diff) | |
| parent | e19054ab3cd5b7cc9a01d0efc71c8fe310541065 (diff) | |
| download | nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.gz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.bz2 nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.lz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.xz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.zst nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.zip | |
Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065'
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index 7b16d6ad9dbc..03857627952d 100644 --- a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -6,7 +6,7 @@ sourcePerArch: }: let cpuName = stdenv.hostPlatform.parsed.cpu.name; - result = stdenv.mkDerivation rec { + result = stdenv.mkDerivation { name = if sourcePerArch.packageType == "jdk" then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}" else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"; @@ -46,9 +46,6 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name; passthru.home = result; - # for backward compatibility - passthru.architecture = ""; - meta = with stdenv.lib; { license = licenses.gpl2Classpath; description = "AdoptOpenJDK, prebuilt OpenJDK binary"; |