Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4cc44f764c8d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8a0c5da64870
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on May 10, 2021

  1. webkitgtk: Fix bubblewrap opengl-driver path 

    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.
    @talyz
    talyz committed May 10, 2021
    Copy the full SHA
    5926b95 View commit details

Commits on May 11, 2021

  1. webkitgtk: 2.32.0 -> 2.32.1 

    https://webkitgtk.org/2021/05/10/webkitgtk2.32.1-released.html
In particular, we now needed to fix the build with icu-69.
    @vcunat
    vcunat committed May 11, 2021
    Copy the full SHA
    a783372 View commit details

Commits on May 12, 2021

  1. Merge #122441: webkitgtk: 2.32.0 -> 2.32.1

    @vcunat
    vcunat committed May 12, 2021
    Copy the full SHA
    1c7d154 View commit details

  2. Merge #122333: webkitgtk: Fix bubblewrap opengl-driver path

    @vcunat
    vcunat committed May 12, 2021
    Copy the full SHA
    8a0c5da View commit details
Showing with 7 additions and 13 deletions.
  1. +4 −2 pkgs/development/libraries/webkitgtk/default.nix
  2. +3 −11 pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch
6 changes: 4 additions & 2 deletions pkgs/development/libraries/webkitgtk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -53,27 +53,29 @@
, xdg-dbus-proxy
, substituteAll
, glib
, addOpenGLRunpath
}:

assert enableGeoLocation -> geoclue2 != null;

stdenv.mkDerivation rec {
pname = "webkitgtk";
version = "2.32.0";
version = "2.32.1";

outputs = [ "out" "dev" ];

separateDebugInfo = stdenv.isLinux;

src = fetchurl {
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
sha256 = "1w3b0w8izp0i070grhv19j631sdcd0mcqnjnax13k8mdx7dg8zcx";
sha256 = "05v9hgpkc6mi2klrd8nqql1n8xzq8rgdz3hvyy369xkhgwqifq8k";
};

patches = lib.optionals stdenv.isLinux [
(substituteAll {
src = ./fix-bubblewrap-paths.patch;
inherit (builtins) storeDir;
inherit (addOpenGLRunpath) driverLink;
})
./libglvnd-headers.patch
];
14 changes: 3 additions & 11 deletions pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
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
@@ -585,7 +585,7 @@
{ 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 @@
@@ -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", "/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.
bindPathVar(sandboxArgs, "LD_LIBRARY_PATH");