cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #174623 from primeos/ungoogled-chromium

Browse source 
ungoogled-chromium: 101.0.4951.64 -> 102.0.5005.61
This commit is contained in:
Michael Weiss 2022-05-26 11:51:58 +02:00 committed by GitHub
commit 0fbb7cc7f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/networking/browsers/chromium/common.nix
View file

@ -166,7 +166,7 @@ let
./patches/m102-fix-dawn_version_generator-failure.patch ./patches/m102-fix-dawn_version_generator-failure.patch
]; ];
postPatch = optionalString (chromiumVersionAtLeast "102") '' postPatch = ''
# Workaround/fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1313361: # Workaround/fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1313361:
substituteInPlace BUILD.gn \ substituteInPlace BUILD.gn \
--replace '"//infra/orchestrator:orchestrator_all",' "" --replace '"//infra/orchestrator:orchestrator_all",' ""
@ -174,7 +174,6 @@ let
substituteInPlace build/config/compiler/BUILD.gn \ substituteInPlace build/config/compiler/BUILD.gn \
--replace '"-Xclang",' "" \ --replace '"-Xclang",' "" \
--replace '"-no-opaque-pointers",' "" --replace '"-no-opaque-pointers",' ""
'' + ''
# remove unused third-party # remove unused third-party
for lib in ${toString gnSystemLibraries}; do for lib in ${toString gnSystemLibraries}; do
if [ -d "third_party/$lib" ]; then if [ -d "third_party/$lib" ]; then
@ -194,7 +193,7 @@ let
--replace "/usr/bin/env -S make -f" "/usr/bin/make -f" --replace "/usr/bin/env -S make -f" "/usr/bin/make -f"
fi fi
chmod -x third_party/webgpu-cts/src/tools/run_deno chmod -x third_party/webgpu-cts/src/tools/run_deno
${lib.optionalString (chromiumVersionAtLeast "102") "chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno"} chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \

16
pkgs/applications/networking/browsers/chromium/upstream-info.json
View file

@ -45,19 +45,19 @@
} }
}, },
"ungoogled-chromium": { "ungoogled-chromium": {
"version": "101.0.4951.64", "version": "102.0.5005.61",
"sha256": "1xyqm32y9v1hn8ji6qfw6maynqgg3266j58dq4x4aqsm2gj9cn4w", "sha256": "07vbi3gn9g4n04b2qi2hm34r122snrqaifa46yk3pyh1d79rfdqs",
"sha256bin64": "14ijrj7h2y72ppyysz6jv40c01lbnan7z69cl24asch2zjlgwv8v", "sha256bin64": "100n8k3d9k5bq58irc36ig6m5m0lxggffyk4crqqqcib2anqd0zv",
"deps": { "deps": {
"gn": { "gn": {
"version": "2022-03-14", "version": "2022-04-14",
"url": "https://gn.googlesource.com/gn", "url": "https://gn.googlesource.com/gn",
"rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb", "rev": "fd9f2036f26d83f9fcfe93042fb952e5a7fe2167",
"sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3" "sha256": "0b5xs0chcv3hfhy71rycsmgxnqbm375a333hwav8929k9cbi5p9h"
}, },
"ungoogled-patches": { "ungoogled-patches": {
"rev": "101.0.4951.64-1", "rev": "102.0.5005.61-1",
"sha256": "0k7w6xvjf1yzyak9ywvcdw762d8zbx6d8haz35q87jz0mxfn2mr3" "sha256": "1hlyi6k894blkkqmqsizx72bag2vj6wlpza0fvi8db5wp6i5b58g"
} }
} }
} }