From ffa8947f4aecee1a7ceb55578159f57f3046f9fc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 30 Nov 2023 04:20:00 +0000 Subject: [PATCH] opam: fix build on darwin --- pkgs/development/tools/ocaml/opam/default.nix | 5 +++++ pkgs/development/tools/ocaml/opam/opam.nix.pl | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index a60b12667fa7..4f85fc52343a 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -122,6 +122,11 @@ in stdenv.mkDerivation { outputs = [ "out" "installer" ]; setOutputFlags = false; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + # change argv0 to "opam" as a workaround for # https://github.com/ocaml/opam/issues/2142 postInstall = '' diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index 412a1a30e70d..77c574cb9321 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -112,6 +112,11 @@ print <<'EOF'; outputs = [ "out" "installer" ]; setOutputFlags = false; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + # change argv0 to "opam" as a workaround for # https://github.com/ocaml/opam/issues/2142 postInstall = ''