gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #271551 from marsam/fix-darwin-opam

Browse Source 
opam: fix build on darwin

Fixes https://github.com/NixOS/nixpkgs/issues/274120
This commit is contained in:
Mario Rodas
2023-12-16 13:58:02 -05:00
committed by GitHub
parent 99cd18434a ffa8947f4a
commit e22d6561dc
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/ocaml/opam/default.nix
+5
View File
@@ -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 = ''
pkgs/development/tools/ocaml/opam/opam.nix.pl
+5
View File
@@ -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 = ''