git.iko.soy/typeable/nixpkgs
on master help sign in
Merge #122333: webkitgtk: Fix bubblewrap opengl-driver path
commit8a0c5da648702f4620e3a2926f48b38dd1d86562 authorVladimír Čunát <v@cunat.cz> dateWed 12 May 2021, 10:34 (6 years ago) parent1c7d1545926b95
2 files changed+5−11
pkgs/development/libraries/webkitgtk/default.nix+2 pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch+3−11
pkgs/development/libraries/webkitgtk/default.nix+2
@@ -53,6 +53,7 @@
5353, xdg-dbus-proxy
5454, substituteAll
5555, glib
56+, addOpenGLRunpath
5657}:
5758
5859assert enableGeoLocation -> geoclue2 != null;
@@ -74,6 +75,7 @@ stdenv.mkDerivation rec {
7475 (substituteAll {
7576 src = ./fix-bubblewrap-paths.patch;
7677 inherit (builtins) storeDir;
78+ inherit (addOpenGLRunpath) driverLink;
7779 })
7880 ./libglvnd-headers.patch
7981 ];
pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch+3−11
@@ -1,16 +1,7 @@
11diff -ru old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
22--- old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-09 04:47:07.000000000 -0400
33+++ webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-20 21:14:10.537921173 -0400
4−@@ -585,7 +585,7 @@
5− { SCMP_SYS(keyctl), nullptr },
6− { SCMP_SYS(request_key), nullptr },
7−
8−- // Scary VM/NUMA ops
9−+ // Scary VM/NUMA ops
10− { SCMP_SYS(move_pages), nullptr },
11− { SCMP_SYS(mbind), nullptr },
12− { SCMP_SYS(get_mempolicy), nullptr },
13−@@ -724,6 +724,11 @@
4+@@ -724,6 +724,12 @@
145 "--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64",
156
167 "--ro-bind-try", PKGLIBEXECDIR, PKGLIBEXECDIR,
@@ -18,7 +9,8 @@ diff -ru old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLa
189+ // Nix Directories
1910+ "--ro-bind", "@storeDir@", "@storeDir@",
2011+ "--ro-bind", "/run/current-system", "/run/current-system",
21−+ "--ro-bind", "/run/opengl-driver", "/run/opengl-driver",
12++ "--ro-bind-try", "@driverLink@/lib", "@driverLink@/lib",
13++ "--ro-bind-try", "@driverLink@/share", "@driverLink@/share",
2214 };
2315 // We would have to parse ld config files for more info.
2416 bindPathVar(sandboxArgs, "LD_LIBRARY_PATH");