diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2023-01-21 18:49:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-21 18:49:59 +0100 |
| commit | 5b3571c0df0f51721cbc4526245e94d1a36a5ace (patch) | |
| tree | 95c00f7dc7fa6f17ddc1150c4b7714806c19df66 | |
| parent | 268ca66b89effa07cd3ce40539a86ade98767c73 (diff) | |
| parent | f8b18c100b9fea36b0289770476baecc2c009c49 (diff) | |
| download | nixpkgs-5b3571c0df0f51721cbc4526245e94d1a36a5ace.tar nixpkgs-5b3571c0df0f51721cbc4526245e94d1a36a5ace.tar.gz nixpkgs-5b3571c0df0f51721cbc4526245e94d1a36a5ace.tar.bz2 nixpkgs-5b3571c0df0f51721cbc4526245e94d1a36a5ace.tar.lz nixpkgs-5b3571c0df0f51721cbc4526245e94d1a36a5ace.tar.xz nixpkgs-5b3571c0df0f51721cbc4526245e94d1a36a5ace.tar.zst nixpkgs-5b3571c0df0f51721cbc4526245e94d1a36a5ace.zip | |
Merge pull request #197367 from Et7f3/use-integrated-as-darwin
| -rw-r--r-- | pkgs/development/compilers/ocaml/generic.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index ea89458c078..1fa52721ddb 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation (args // { preConfigure = optionalString (lib.versionOlder version "4.04") '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang - '' + optionalString (stdenv.isDarwin && lib.versionOlder version "4.13") '' + '' + optionalString (stdenv.isDarwin) '' # Do what upstream does by default now: https://github.com/ocaml/ocaml/pull/10176 # This is required for aarch64-darwin, everything else works as is. AS="${stdenv.cc}/bin/cc -c" ASPP="${stdenv.cc}/bin/cc -c" |