diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2019-11-24 13:55:22 +0900 |
|---|---|---|
| committer | Herwig Hochleitner <hhochleitner@gmail.com> | 2019-11-26 01:25:39 +0100 |
| commit | 6ec5e745dc4f9dc5f321989fef4a5fa66a21c7b2 (patch) | |
| tree | 337d04562b5a86294640e568d87d66b3138ae00b /pkgs/applications/networking/browsers/chromium/default.nix | |
| parent | f191360ad051fc1bc153fb5193ed14820b99aa84 (diff) | |
| download | nixpkgs-6ec5e745dc4f9dc5f321989fef4a5fa66a21c7b2.tar nixpkgs-6ec5e745dc4f9dc5f321989fef4a5fa66a21c7b2.tar.gz nixpkgs-6ec5e745dc4f9dc5f321989fef4a5fa66a21c7b2.tar.bz2 nixpkgs-6ec5e745dc4f9dc5f321989fef4a5fa66a21c7b2.tar.lz nixpkgs-6ec5e745dc4f9dc5f321989fef4a5fa66a21c7b2.tar.xz nixpkgs-6ec5e745dc4f9dc5f321989fef4a5fa66a21c7b2.tar.zst nixpkgs-6ec5e745dc4f9dc5f321989fef4a5fa66a21c7b2.zip | |
chromium: fix aarch64 build
The skia patch no longer applies, and is no longer necessary. The current version of chromium doesn't build with gcc. This has been fixed upstream[1] and could be backported, but switching aarch64 to clang/llvm and making the build the same on all platforms is simpler. [1] https://chromium.googlesource.com/chromium/src/+/9662ec844017690d5fd56bf0f05ef6a540dd29c1
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/default.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 8329bf3ef55..369367bae42 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,4 @@ -{ newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_8 +{ newScope, config, stdenv, llvmPackages_8 , makeWrapper, ed , glib, gtk3, gnome3, gsettings-desktop-schemas , libva ? null @@ -20,11 +20,8 @@ }: let - stdenv_ = if stdenv.isAarch64 then gcc8Stdenv else llvmPackages_8.stdenv; - llvmPackages_ = if stdenv.isAarch64 then llvmPackages else llvmPackages_8; -in let - stdenv = stdenv_; - llvmPackages = llvmPackages_; + stdenv = llvmPackages_8.stdenv; + llvmPackages = llvmPackages_8; callPackage = newScope chromium; |