Merge #122333: webkitgtk: Fix bubblewrap opengl-driver path
This commit is contained in:
commit
8a0c5da648
|
@ -53,6 +53,7 @@
|
||||||
, xdg-dbus-proxy
|
, xdg-dbus-proxy
|
||||||
, substituteAll
|
, substituteAll
|
||||||
, glib
|
, glib
|
||||||
|
, addOpenGLRunpath
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert enableGeoLocation -> geoclue2 != null;
|
assert enableGeoLocation -> geoclue2 != null;
|
||||||
|
@ -74,6 +75,7 @@ stdenv.mkDerivation rec {
|
||||||
(substituteAll {
|
(substituteAll {
|
||||||
src = ./fix-bubblewrap-paths.patch;
|
src = ./fix-bubblewrap-paths.patch;
|
||||||
inherit (builtins) storeDir;
|
inherit (builtins) storeDir;
|
||||||
|
inherit (addOpenGLRunpath) driverLink;
|
||||||
})
|
})
|
||||||
./libglvnd-headers.patch
|
./libglvnd-headers.patch
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,16 +1,7 @@
|
||||||
diff -ru old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
|
diff -ru old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
|
||||||
--- old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-09 04:47:07.000000000 -0400
|
--- old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-09 04:47:07.000000000 -0400
|
||||||
+++ webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-20 21:14:10.537921173 -0400
|
+++ webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-20 21:14:10.537921173 -0400
|
||||||
@@ -585,7 +585,7 @@
|
@@ -724,6 +724,12 @@
|
||||||
{ SCMP_SYS(keyctl), nullptr },
|
|
||||||
{ SCMP_SYS(request_key), nullptr },
|
|
||||||
|
|
||||||
- // Scary VM/NUMA ops
|
|
||||||
+ // Scary VM/NUMA ops
|
|
||||||
{ SCMP_SYS(move_pages), nullptr },
|
|
||||||
{ SCMP_SYS(mbind), nullptr },
|
|
||||||
{ SCMP_SYS(get_mempolicy), nullptr },
|
|
||||||
@@ -724,6 +724,11 @@
|
|
||||||
"--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64",
|
"--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64",
|
||||||
|
|
||||||
"--ro-bind-try", PKGLIBEXECDIR, PKGLIBEXECDIR,
|
"--ro-bind-try", PKGLIBEXECDIR, PKGLIBEXECDIR,
|
||||||
|
@ -18,7 +9,8 @@ diff -ru old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLa
|
||||||
+ // Nix Directories
|
+ // Nix Directories
|
||||||
+ "--ro-bind", "@storeDir@", "@storeDir@",
|
+ "--ro-bind", "@storeDir@", "@storeDir@",
|
||||||
+ "--ro-bind", "/run/current-system", "/run/current-system",
|
+ "--ro-bind", "/run/current-system", "/run/current-system",
|
||||||
+ "--ro-bind", "/run/opengl-driver", "/run/opengl-driver",
|
+ "--ro-bind-try", "@driverLink@/lib", "@driverLink@/lib",
|
||||||
|
+ "--ro-bind-try", "@driverLink@/share", "@driverLink@/share",
|
||||||
};
|
};
|
||||||
// We would have to parse ld config files for more info.
|
// We would have to parse ld config files for more info.
|
||||||
bindPathVar(sandboxArgs, "LD_LIBRARY_PATH");
|
bindPathVar(sandboxArgs, "LD_LIBRARY_PATH");
|
||||||
|
|
Loading…
Reference in a new issue