diff options
| author | Niklas Hambüchen <mail@nh2.me> | 2020-03-24 17:37:37 +0100 |
|---|---|---|
| committer | Niklas Hambüchen <mail@nh2.me> | 2020-03-24 22:50:49 +0100 |
| commit | 015bb28ae18f36cb17073ffeefb34ea61c92ab53 (patch) | |
| tree | ff90c6416a510d14cb76133ed7622963cf8afeb8 /pkgs/applications/networking/browsers | |
| parent | d96bd3394b734487d1c3bfbac0e8f17465e03afe (diff) | |
chromium: Enable swiftshader by default.
This makes it possible to use chromium headless with WebGL (e.g. for webdriver tests) without having to rebuild from source. The upstram default is to enable, thus simply removing our disabling switch. Also fixes #41918.
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 255b399ef3da4..88af180e2c8dd 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -244,7 +244,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: |