diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2020-03-25 13:42:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-25 13:42:30 +0100 |
| commit | 29becfcf19f6b50b0f2d12a15aff22b586f8067b (patch) | |
| tree | 3f9799189ab2852ec8a7a2f32fd9251d3e0031c2 /pkgs/applications/networking/browsers | |
| parent | 5ce4be453612909a810c1d43a05c31a90bfbbb6f (diff) | |
| parent | 015bb28ae18f36cb17073ffeefb34ea61c92ab53 (diff) | |
Merge pull request #83304 from nh2/issue-41918-chromium-swiftshader-by-default
chromium: Enable swiftshader by default.
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/browser.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index ec69f3d233f4f..edbf97e896338 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -18,6 +18,16 @@ mkChromiumDerivation (base: rec { cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" + # Swiftshader + # See https://stackoverflow.com/a/4264351/263061 for the find invocation. + if [ -n "$(find "$buildPath/swiftshader/" -maxdepth 1 -name '*.so' -print -quit)" ]; then + echo "Swiftshader files found; installing" + mkdir -p "$libExecPath/swiftshader" + cp -v "$buildPath/swiftshader/"*.so "$libExecPath/swiftshader/" + else + echo "Swiftshader files not found" + fi + mkdir -p "$sandbox/bin" cp -v "$buildPath/chrome_sandbox" "$sandbox/bin/${sandboxExecutableName}" diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 784fe45a03b6a..83c492e1e651b 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -242,7 +242,6 @@ let is_clang = stdenv.cc.isClang; clang_use_chrome_plugins = false; blink_symbol_level = 0; - enable_swiftshader = false; fieldtrial_testing_like_official_build = true; # Google API keys, see: |