5926b95fbe
If `/run/opengl-driver/lib` is in `LD_LIBRARY_PATH`, bwrap will try to mount it into the already bind mounted `/run/opengl-driver`. To prevent this, we instead specify the subpaths of `/run/opengl-driver` we're interested in. Also, use the correct path for i686 builds.
16 lines
958 B
Diff
16 lines
958 B
Diff
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
|
|
+++ webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-20 21:14:10.537921173 -0400
|
|
@@ -724,6 +724,12 @@
|
|
"--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64",
|
|
|
|
"--ro-bind-try", PKGLIBEXECDIR, PKGLIBEXECDIR,
|
|
+
|
|
+ // Nix Directories
|
|
+ "--ro-bind", "@storeDir@", "@storeDir@",
|
|
+ "--ro-bind", "/run/current-system", "/run/current-system",
|
|
+ "--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.
|
|
bindPathVar(sandboxArgs, "LD_LIBRARY_PATH");
|