diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-05-07 15:24:32 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-05-07 15:24:32 +0000 |
| commit | 57de38fd6a0739915cee95609d03d50fc40b627f (patch) | |
| tree | 7e2b2588b9b6635af40f236f3fb0337cefcb03a0 | |
| parent | 4bac767ba9413b2b3987f19af2bf52a70536db9f (diff) | |
| download | nixlib-57de38fd6a0739915cee95609d03d50fc40b627f.tar nixlib-57de38fd6a0739915cee95609d03d50fc40b627f.tar.gz nixlib-57de38fd6a0739915cee95609d03d50fc40b627f.tar.bz2 nixlib-57de38fd6a0739915cee95609d03d50fc40b627f.tar.lz nixlib-57de38fd6a0739915cee95609d03d50fc40b627f.tar.xz nixlib-57de38fd6a0739915cee95609d03d50fc40b627f.tar.zst nixlib-57de38fd6a0739915cee95609d03d50fc40b627f.zip | |
firefox: build with clang
| -rw-r--r-- | nixpkgs-overlays/patches/firefox/packages.nix | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/nixpkgs-overlays/patches/firefox/packages.nix b/nixpkgs-overlays/patches/firefox/packages.nix index aac5c2eb5c50..ec4fdcc5336e 100644 --- a/nixpkgs-overlays/patches/firefox/packages.nix +++ b/nixpkgs-overlays/patches/firefox/packages.nix @@ -1,17 +1,27 @@ -{ firefoxPackages }: +{ firefoxPackages, clangStdenv }: with firefoxPackages; firefoxPackages // { - firefox = firefox.overrideAttrs ({ patches ? [], ... }: { + # Use clangStdenv to work around + # <https://github.com/NixOS/nixpkgs/issues/84283> + # (Firefox fails to build with GCC on AMD EPYC 7401P.) + + firefox = (firefox.override { + stdenv = clangStdenv; + }).overrideAttrs ({ patches ? [], ... }: { patches = patches ++ [ release/D6695.diff ]; }); - firefox-beta = firefox-beta.overrideAttrs ({ patches ? [], ... }: { + firefox-beta = (firefox-beta.override { + stdenv = clangStdenv; + }).overrideAttrs ({ patches ? [], ... }: { patches = patches ++ [ beta/D6695.diff ]; }); - firefox-nightly = firefox-nightly.overrideAttrs ({ patches ? [], ... }: { + firefox-nightly = (firefox-nightly.override { + stdenv = clangStdenv; + }).overrideAttrs ({ patches ? [], ... }: { patches = patches ++ [ nightly/D6695.diff ]; }); } |