diff options
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/ocaml/3.12.1.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/ocaml/cvs.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index 155523ebe56..44fe2d139d8 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, ncurses, x11 }: let - useX11 = stdenv.system != "armv5tel-linux"; - useNativeCompilers = stdenv.system != "armv5tel-linux"; + useX11 = !stdenv.isArm; + useNativeCompilers = !stdenv.isArm; inherit (stdenv.lib) optionals optionalString; in diff --git a/pkgs/development/compilers/ocaml/cvs.nix b/pkgs/development/compilers/ocaml/cvs.nix index 475a1d46d58..cc40ca9aac5 100644 --- a/pkgs/development/compilers/ocaml/cvs.nix +++ b/pkgs/development/compilers/ocaml/cvs.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation (rec { prefixKey = "-prefix "; configureFlags = ["-no-tk"]; buildFlags = "world" + - (if (stdenv.system != "armv5tel-linux") then "bootstrap world.opt" else ""); + (if !stdenv.isArm then "bootstrap world.opt" else ""); buildInputs = [ncurses]; - installTargets = "install" + (if (stdenv.system != "armv5tel-linux") then "installopt" else ""); + installTargets = "install" + (if !stdenv.isArm then "installopt" else ""); patchPhase = '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang |