diff options
author | Merijn Broeren <merijnb@iloquent.com> | 2019-10-27 13:03:25 +0000 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 12:58:11 +0100 |
commit | 133103d7094c148bdc9152562b16c8872c44f345 (patch) | |
tree | 2ccef8bd86eff2104561da4eccdd41dd6776950b /pkgs/development/compilers/ocaml/generic.nix | |
parent | 08d5fc393457121b531417ee6c922e3ebee0187c (diff) |
treewide: replace make/build/configure/patchFlags with nix lists
Diffstat (limited to 'pkgs/development/compilers/ocaml/generic.nix')
-rw-r--r-- | pkgs/development/compilers/ocaml/generic.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index d39c0d86fd573..6980b6e5ff134 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -55,10 +55,10 @@ stdenv.mkDerivation (args // { ++ optional flambdaSupport (flags "--enable-flambda" "-flambda") ; - buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; + buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses ++ optionals useX11 [ libX11 xorgproto ]; - installTargets = "install" + optionalString useNativeCompilers " installopt"; + installTargets = [ "install" ] ++ optional useNativeCompilers "installopt"; preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang |