ocaml: adds an argument to enable flambda

authored by Vincent Laporte and committed by Vincent Laporte efcb3923 76c146c9

+10 -4
+10 -4
pkgs/development/compilers/ocaml/generic.nix
··· 10 safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips); 11 in 12 13 - { stdenv, fetchurl, ncurses, buildEnv, libX11, xproto, useX11 ? safeX11 stdenv }: 14 15 assert useX11 -> !stdenv.isArm && !stdenv.isMips; 16 17 let 18 useNativeCompilers = !stdenv.isMips; 19 - inherit (stdenv.lib) optionals optionalString; 20 - name = "ocaml-${version}"; 21 in 22 23 stdenv.mkDerivation (args // rec { ··· 36 37 prefixKey = "-prefix "; 38 configureFlags = optionals useX11 [ "-x11lib" x11lib 39 - "-x11include" x11inc ]; 40 41 buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; 42 buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ];
··· 10 safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips); 11 in 12 13 + { stdenv, fetchurl, ncurses, buildEnv 14 + , libX11, xproto, useX11 ? safeX11 stdenv 15 + , flambdaSupport ? false 16 + }: 17 18 assert useX11 -> !stdenv.isArm && !stdenv.isMips; 19 + assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03"; 20 21 let 22 useNativeCompilers = !stdenv.isMips; 23 + inherit (stdenv.lib) optional optionals optionalString; 24 + name = "ocaml${optionalString flambdaSupport "+flambda"}-${version}"; 25 in 26 27 stdenv.mkDerivation (args // rec { ··· 40 41 prefixKey = "-prefix "; 42 configureFlags = optionals useX11 [ "-x11lib" x11lib 43 + "-x11include" x11inc ] 44 + ++ optional flambdaSupport "-flambda" 45 + ; 46 47 buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; 48 buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ];