diff options
| author | Herwig Hochleitner <herwig@bendlas.net> | 2018-02-27 00:04:33 +0100 |
|---|---|---|
| committer | Herwig Hochleitner <herwig@bendlas.net> | 2018-02-27 00:08:38 +0100 |
| commit | c2339ed75a382d7ec7646674b2d56e589774285c (patch) | |
| tree | addfc83b87bb1a759d7cdd88afec5230a46d6ffe /pkgs/applications | |
| parent | d8ef48ec7ebb6ad933d3f09d16b079db5b694cb2 (diff) | |
chromium: replace ninja workaround with upstream patch
https://github.com/NixOS/nixpkgs/issues/35296 This reverts workaround commit e3cb6e77720109b217b9a9d2154901d4b0167af2.
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/browser.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 404f259690971..e35d894e0e7eb 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -5,9 +5,7 @@ with stdenv.lib; mkChromiumDerivation (base: rec { name = "chromium-browser"; packageName = "chromium"; - ## mojo_platform_bindings is built ahead of chrome, because of spurious - ## build errors, see https://github.com/NixOS/nixpkgs/issues/35296 - buildTargets = [ "mksnapshot" "mojo_platform_bindings" "chrome_sandbox" "chrome" ]; + buildTargets = [ "mksnapshot" "chrome_sandbox" "chrome" ]; outputs = ["out" "sandbox"]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3be03f65106e2..f5ec42974c74a 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, ninja, which, nodejs, fetchurl, gnutar +{ stdenv, ninja, which, nodejs, fetchurl, fetchpatch, gnutar # default dependencies , bzip2, flac, speex, libopus @@ -44,10 +44,14 @@ let # source tree. extraAttrs = buildFun base; - gentooPatch = name: sha256: fetchurl { + gentooPatch = name: sha256: fetchpatch { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/${name}"; inherit sha256; }; + githubPatch = commit: sha256: fetchpatch { + url = "https://github.com/chromium/chromium/commit/${commit}.patch"; + inherit sha256; + }; mkGnFlags = let @@ -147,6 +151,8 @@ let ] ++ optionals (versionRange "64" "65") [ (gentooPatch "chromium-cups-r0.patch" "0hyjlfh062c8h54j4b27y4dq5yzd4w6mxzywk3s02yf6cj3cbkrl") (gentooPatch "chromium-angle-r0.patch" "0izdrqwsyr48117dhvwdsk8c6dkrnq2njida1q4mb1lagvwbz7gc") + # missing ninja dep https://github.com/NixOS/nixpkgs/issues/35296#issuecomment-368666833 + (githubPatch "b1e3cfd4f9bfe43a1e08c5670b51c8c80d3e6372" "17vih86rpsy282r8ikrf2q5gfjdwqzvyn8859i75xzvl8agyhbaa") ] ++ optionals (versionRange "65" "66") [ #(gentooPatch "chromium-gcc-r0.patch" "127xdwabizn5gz8rf1qsw62i7m0b5bsfjqxv4kdbsnizmjanddf8") #(gentooPatch "chromium-memcpy-r0.patch" "1d3vra59wjg2lva7ddv55ff6l57mk9k50llsplr0b7vxk0lh0ps5") |