diff options
| author | Ivan Kozik <ivan@ludios.org> | 2019-01-30 22:55:20 +0000 |
|---|---|---|
| committer | Herwig Hochleitner <herwig@bendlas.net> | 2019-01-31 20:06:16 +0100 |
| commit | 03960a323db7b83ba0ef46e6906640fa6de0402e (patch) | |
| tree | ddd8f9366aaa3b75ddf38d4533d4094d305de11e /pkgs/applications/networking/browsers/chromium/common.nix | |
| parent | 52eb2c45f6a075b8ae8c2f40310cabc5b23939ec (diff) | |
| download | nixpkgs-03960a323db7b83ba0ef46e6906640fa6de0402e.tar nixpkgs-03960a323db7b83ba0ef46e6906640fa6de0402e.tar.gz nixpkgs-03960a323db7b83ba0ef46e6906640fa6de0402e.tar.bz2 nixpkgs-03960a323db7b83ba0ef46e6906640fa6de0402e.tar.lz nixpkgs-03960a323db7b83ba0ef46e6906640fa6de0402e.tar.xz nixpkgs-03960a323db7b83ba0ef46e6906640fa6de0402e.tar.zst nixpkgs-03960a323db7b83ba0ef46e6906640fa6de0402e.zip | |
chromium: make the new audio sandbox NixOS-compatible
Deal with https://chromium.googlesource.com/chromium/src/+/f2fc90bb74a05cffde6b4363ee575fcca7c45197 which landed https://github.com/chromium/chromium/blob/master/services/audio/audio_sandbox_hook_linux.cc containing /usr/share and /usr/lib/x86_64-linux-gnu paths. closes https://github.com/NixOS/nixpkgs/pull/54960
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 0c199dab6bc..5d59f7514c6 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -12,6 +12,7 @@ , utillinux, alsaLib , bison, gperf , glib, gtk2, gtk3, dbus-glib +, glibc , libXScrnSaver, libXcursor, libXtst, libGLU_combined , protobuf, speechd, libXdamage, cups , ffmpeg, libxslt, libxml2, at-spi2-core @@ -163,6 +164,17 @@ let 'return sandbox_binary;' \ 'return base::FilePath(GetDevelSandboxPath());' + substituteInPlace services/audio/audio_sandbox_hook_linux.cc \ + --replace \ + '/usr/share/alsa/' \ + '${alsaLib}/share/alsa/' \ + --replace \ + '/usr/lib/x86_64-linux-gnu/gconv/' \ + '${glibc}/lib/gconv/' \ + --replace \ + '/usr/share/locale/' \ + '${glibc}/share/locale/' + sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \ chrome/browser/shell_integration_linux.cc |