diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-11-24 19:39:12 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-11-24 19:39:12 +0100 |
| commit | 1216a5ba22a93a4a3a3bfdb4bff0f4727c576fcc (patch) | |
| tree | 742a41f453b4178de4c4af77d73711a7b9d7adc7 | |
| parent | Merge pull request #268375 from NixOS/backport-268300-to-release-23.05 (diff) | |
| parent | buildMozillaMach: fix crashes due to statically linked libstdc++ (diff) | |
| download | nixpkgs-1216a5ba22a93a4a3a3bfdb4bff0f4727c576fcc.tar.gz | |
Merge #269680: buildMozillaMach: fix crashes due to libstdc++
...into release-23.05
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index aadbb32d6e02..815fe5383ade 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -516,6 +516,11 @@ buildStdenv.mkDerivation ({ LDFLAGS = "-Wl,-rpath,${placeholder "out"}/lib/${binaryName}"; }; + # workaround for clang statically linking against libstdc++ + NIX_LDFLAGS = lib.optionals stdenv.cc.isGNU [ + "-L${stdenv.cc.cc.lib}/lib" + ]; + # tests were disabled in configureFlags doCheck = false; |