pyrox.dev
chromium: replace ninja workaround with upstream patch
https://github.com/NixOS/nixpkgs/issues/35296
This reverts workaround commit e3cb6e77720109b217b9a9d2154901d4b0167af2.
+1
-3
pkgs/applications/networking/browsers/chromium/browser.nix
+1
-3
pkgs/applications/networking/browsers/chromium/browser.nix
···
5
5
mkChromiumDerivation (base: rec {
6
6
name = "chromium-browser";
7
7
packageName = "chromium";
8
-
## mojo_platform_bindings is built ahead of chrome, because of spurious
9
-
## build errors, see https://github.com/NixOS/nixpkgs/issues/35296
10
-
buildTargets = [ "mksnapshot" "mojo_platform_bindings" "chrome_sandbox" "chrome" ];
8
+
buildTargets = [ "mksnapshot" "chrome_sandbox" "chrome" ];
11
9
12
10
outputs = ["out" "sandbox"];
13
11
+8
-2
pkgs/applications/networking/browsers/chromium/common.nix
+8
-2
pkgs/applications/networking/browsers/chromium/common.nix
···
1
-
{ stdenv, ninja, which, nodejs, fetchurl, gnutar
1
+
{ stdenv, ninja, which, nodejs, fetchurl, fetchpatch, gnutar
2
2
3
3
# default dependencies
4
4
, bzip2, flac, speex, libopus
···
44
44
# source tree.
45
45
extraAttrs = buildFun base;
46
46
47
-
gentooPatch = name: sha256: fetchurl {
47
+
gentooPatch = name: sha256: fetchpatch {
48
48
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/${name}";
49
+
inherit sha256;
50
+
};
51
+
githubPatch = commit: sha256: fetchpatch {
52
+
url = "https://github.com/chromium/chromium/commit/${commit}.patch";
49
53
inherit sha256;
50
54
};
51
55
···
147
151
] ++ optionals (versionRange "64" "65") [
148
152
(gentooPatch "chromium-cups-r0.patch" "0hyjlfh062c8h54j4b27y4dq5yzd4w6mxzywk3s02yf6cj3cbkrl")
149
153
(gentooPatch "chromium-angle-r0.patch" "0izdrqwsyr48117dhvwdsk8c6dkrnq2njida1q4mb1lagvwbz7gc")
154
+
# missing ninja dep https://github.com/NixOS/nixpkgs/issues/35296#issuecomment-368666833
155
+
(githubPatch "b1e3cfd4f9bfe43a1e08c5670b51c8c80d3e6372" "17vih86rpsy282r8ikrf2q5gfjdwqzvyn8859i75xzvl8agyhbaa")
150
156
] ++ optionals (versionRange "65" "66") [
151
157
#(gentooPatch "chromium-gcc-r0.patch" "127xdwabizn5gz8rf1qsw62i7m0b5bsfjqxv4kdbsnizmjanddf8")
152
158
#(gentooPatch "chromium-memcpy-r0.patch" "1d3vra59wjg2lva7ddv55ff6l57mk9k50llsplr0b7vxk0lh0ps5")