diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-11-19 14:30:32 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-11-19 14:31:57 -0800 |
| commit | fadaef5aedb6b35681248f8c6096083b2efeb284 (patch) | |
| tree | f7a6438a6b48d9bb734411ff0042d995db3d3144 /pkgs/applications/networking/browsers/chromium/common.nix | |
| parent | 7268b1ea831e7349d5a8749a82693981bfec25ae (diff) | |
| parent | 64cd57dd4fcf75e276543e182097cad5a6b234fb (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/applications/networking/browsers/chromium/common.nix
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 193543ea54abd..7edec1f5a6250 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -150,7 +150,6 @@ let libva libdrm wayland mesa.drivers libxkbcommon curl - ] ++ optionals (chromiumVersionAtLeast "96") [ libepoxy ] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ++ optional gnomeKeyringSupport libgnome-keyring3 @@ -183,7 +182,7 @@ let substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" fi - chmod -x third_party/webgpu-cts/src/tools/${lib.optionalString (chromiumVersionAtLeast "96") "run_"}deno + chmod -x third_party/webgpu-cts/src/tools/run_deno # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ |