diff options
| author | Graham Christensen <graham@grahamc.com> | 2017-12-12 20:06:36 -0500 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2017-12-12 20:06:36 -0500 |
| commit | 105d9519c128a8954e5dd1616f71311ddde20cbc (patch) | |
| tree | bfb3663fa37d175451e3e01fada66652e4297e7f /pkgs/development/compilers | |
| parent | c2b679516f79ae349421f22d4da26915eb9905e4 (diff) | |
| parent | e5629dc51a313c3b99725616718d2deff49cd891 (diff) | |
| download | nixlib-105d9519c128a8954e5dd1616f71311ddde20cbc.tar nixlib-105d9519c128a8954e5dd1616f71311ddde20cbc.tar.gz nixlib-105d9519c128a8954e5dd1616f71311ddde20cbc.tar.bz2 nixlib-105d9519c128a8954e5dd1616f71311ddde20cbc.tar.lz nixlib-105d9519c128a8954e5dd1616f71311ddde20cbc.tar.xz nixlib-105d9519c128a8954e5dd1616f71311ddde20cbc.tar.zst nixlib-105d9519c128a8954e5dd1616f71311ddde20cbc.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/jetbrains-jdk/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 383283309ddf..7f23a4d507e7 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -16,7 +16,7 @@ let drv = stdenv.mkDerivation rec { sha256 = "1768f02i3dxdbxn8n29d522h8v0mkgnhpb8ixzq5p54vwjmfl6md"; } else - abort "unsupported system: ${stdenv.system}"; + throw "unsupported system: ${stdenv.system}"; nativeBuildInputs = [ file ]; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index fadae3eb5925..554c322781fc 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -44,7 +44,7 @@ assert stdenv.system == "i686-linux" assert swingSupport -> xorg != null; let - abortArch = abort "jdk requires i686-linux, x86_64-linux, aarch64-linux or armv7l-linux"; + abortArch = throw "Unsupported system: ${stdenv.system}"; /** * The JRE libraries are in directories that depend on the CPU. |