diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-29 18:39:36 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-12-29 18:39:36 +0100 |
commit | a1a3e54ac91d087e27da6b95a83ac375bb7c0603 (patch) | |
tree | edc64167f315a48faa4e96e04232f7606d603301 /pkgs/development/compilers | |
parent | 0ac589246a7020d6ed024353b8b39ef1c363e50e (diff) | |
parent | 805e25988f779476f8aed7d13d9fcfaa47010dab (diff) | |
download | nixlib-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.tar nixlib-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.tar.gz nixlib-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.tar.bz2 nixlib-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.tar.lz nixlib-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.tar.xz nixlib-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.tar.zst nixlib-a1a3e54ac91d087e27da6b95a83ac375bb7c0603.zip |
Merge branch 'master' into staging
Haskell rebuild :-) Hydra: ?compare=1421865
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/ocaml/generic.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 17b3033c31df..03ae6e518d0b 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -10,14 +10,18 @@ let safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips); in -{ stdenv, fetchurl, ncurses, buildEnv, libX11, xproto, useX11 ? safeX11 stdenv }: +{ stdenv, fetchurl, ncurses, buildEnv +, libX11, xproto, useX11 ? safeX11 stdenv +, flambdaSupport ? false +}: assert useX11 -> !stdenv.isArm && !stdenv.isMips; +assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03"; let useNativeCompilers = !stdenv.isMips; - inherit (stdenv.lib) optionals optionalString; - name = "ocaml-${version}"; + inherit (stdenv.lib) optional optionals optionalString; + name = "ocaml${optionalString flambdaSupport "+flambda"}-${version}"; in stdenv.mkDerivation (args // rec { @@ -36,7 +40,9 @@ stdenv.mkDerivation (args // rec { prefixKey = "-prefix "; configureFlags = optionals useX11 [ "-x11lib" x11lib - "-x11include" x11inc ]; + "-x11include" x11inc ] + ++ optional flambdaSupport "-flambda" + ; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ]; |