diff options
| author | Graham Christensen <graham@grahamc.com> | 2017-12-12 18:55:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 18:55:23 -0500 |
| commit | e5629dc51a313c3b99725616718d2deff49cd891 (patch) | |
| tree | db8c9beb70833b2503e8c9da305dc3ac0294f8fe /pkgs/development/compilers | |
| parent | 3cad1abf9e5e8a4e0b38270b1d7c7cd89a97e92b (diff) | |
| parent | f33a513d2b1f07da28549ffb7067f913bb3e302a (diff) | |
| download | nixlib-e5629dc51a313c3b99725616718d2deff49cd891.tar nixlib-e5629dc51a313c3b99725616718d2deff49cd891.tar.gz nixlib-e5629dc51a313c3b99725616718d2deff49cd891.tar.bz2 nixlib-e5629dc51a313c3b99725616718d2deff49cd891.tar.lz nixlib-e5629dc51a313c3b99725616718d2deff49cd891.tar.xz nixlib-e5629dc51a313c3b99725616718d2deff49cd891.tar.zst nixlib-e5629dc51a313c3b99725616718d2deff49cd891.zip | |
Merge pull request #32365 from vcunat/p/check-meta
check meta, treewide
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. |