diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-03-02 08:02:06 +0200 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-03-02 08:02:06 +0200 |
| commit | 11b07d930ddab70c3a82234fe83ed5d649b2ac52 (patch) | |
| tree | dfc76ce930dfa6f8ae16673c445bc4febd290778 | |
| parent | 39a2b0b3bf1849354e033a8752e3eff484195ebc (diff) | |
firefox, spidermonkey: remove NIX_LDFLAGS
This commit reverts #210859, since aarch64-linux now uses GCC 12 by default.
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/interpreters/spidermonkey/common.nix | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 948b32172489..8c8fca65c66d 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -471,9 +471,6 @@ buildStdenv.mkDerivation ({ separateDebugInfo = enableDebugSymbols; enableParallelBuilding = true; - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null; - # tests were disabled in configureFlags doCheck = false; diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index a6b0282ce5c1..244a699fd54b 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -136,9 +136,6 @@ stdenv.mkDerivation (finalAttrs: rec { # while we have a double-float toolchain env.NIX_CFLAGS_COMPILE = lib.optionalString (with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91") "-mabi=lp64d"; - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null; - postPatch = lib.optionalString (lib.versionOlder version "102") '' # This patch is a manually applied fix of # https://bugzilla.mozilla.org/show_bug.cgi?id=1644600 |