From 87843991ef4b22c5b0e1dbdffcb6c1edfcbfef83 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 4 Nov 2021 10:22:30 +0100 Subject: [PATCH] ocaml: fix assembler on darwin --- pkgs/development/compilers/ocaml/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index e4cec4cf52ed..1b6a3b56e622 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (args // { preConfigure = optionalString (!lib.versionAtLeast version "4.04") '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang - '' + optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + '' + optionalString (stdenv.isDarwin && !lib.versionAtLeast version "4.13") '' # 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"