nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-24 13:05:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

chromium: replace ninja workaround with upstream patch

Browse Source 
https://github.com/NixOS/nixpkgs/issues/35296

This reverts workaround commit e3cb6e7772.
This commit is contained in:
Herwig Hochleitner 2018-02-27 00:04:33 +01:00
parent d8ef48ec7e
commit c2339ed75a
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/chromium/browser.nix
View File

@ -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"];

10
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -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")