nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-26 02:05:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #147505 from NixOS/backport-147422-to-release-21.11

Browse Source 
[Backport release-21.11] ocaml: heed hardeningDisable flags set for individual versions, fixing many coq versions on darwin
This commit is contained in:
Domen Kožar
2021-11-26 21:29:38 +01:00
committed by GitHub
parent 6e98787d1e 791531028f
commit 91c12917e1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/ocaml/generic.nix
View File

@@ -66,7 +66,8 @@ stdenv.mkDerivation (args // {
dontAddStaticConfigureFlags = lib.versionOlder version "4.08";
configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08") [ "host" "target" ];
# x86_64-unknown-linux-musl-ld: -r and -pie may not be used together
hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie";
hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie"
++ lib.optionals (args ? hardeningDisable) args.hardeningDisable;
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
buildInputs = optional (!lib.versionAtLeast version "4.07") ncurses