movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code 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
commit e22d6561dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/tools/ocaml/opam/default.nix
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 = ''

5
pkgs/development/tools/ocaml/opam/opam.nix.pl
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 = ''