diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-19 12:11:04 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-19 12:11:04 +0100 |
| commit | 024407bf9adeadc115eeeb3fdf8dba166ea17d7c (patch) | |
| tree | 0f28c316cea0b7aa95bb15a0df90077415721d71 /pkgs/development/compilers | |
| parent | bce12effa7f4279d057acf437e7fdcafefd16557 (diff) | |
| parent | 390ed4a626211fb7d19fb8da7661c8e3b42c4795 (diff) | |
| download | nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.gz nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.bz2 nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.lz nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.xz nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.zst nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.zip | |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1505754
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ocaml/4.08.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/compilers/ocaml/generic.nix | 6 |
2 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ocaml/4.08.nix b/pkgs/development/compilers/ocaml/4.08.nix new file mode 100644 index 00000000000..c6d0a114974 --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.08.nix @@ -0,0 +1,12 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "08"; + patch_version = "0+beta1"; + sha256 = "1jgvp4pyhrg27wqpsx88kacw3ymjiz44nms9lzbh5s8pp05z5f5f"; + + # If the executable is stripped it does not work + dontStrip = true; + + # Breaks build with Clang + hardeningDisable = [ "strictoverflow" ]; +} diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 7ada5b804e3..0085739147b 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -41,8 +41,10 @@ stdenv.mkDerivation (args // rec { }; prefixKey = "-prefix "; - configureFlags = optionals useX11 [ "-x11lib" x11lib - "-x11include" x11inc ] + configureFlags = optionals useX11 ( + if stdenv.lib.versionAtLeast version "4.08" + then [ "--x-libraries=${x11lib}" "--x-includes=${x11inc}"] + else [ "-x11lib" x11lib "-x11include" x11inc ]) ++ optional flambdaSupport "-flambda" ; |