diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-05-30 11:43:55 +0800 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-05-31 10:38:27 +0000 |
| commit | d6247c820e8712aabe2a8524fd073d6aef781d31 (patch) | |
| tree | 77830ffffb31c4800f330dbea847a80a1d50d635 | |
| parent | Merge pull request #235047 from NixOS/backport-235040-to-release-23.05 (diff) | |
| download | nixpkgs-d6247c820e8712aabe2a8524fd073d6aef781d31.tar.gz | |
webkitgtk: 2.40.1 → 2.40.2
https://webkitgtk.org/2023/05/29/webkitgtk2.40.2-released.html
https://github.com/WebKit/WebKit/compare/webkitgtk-2.40.1...webkitgtk-2.40.2
CVE-2023-28204
CVE-2023-32373
(cherry picked from commit b5da7670cf2b014e1a71838e224b9e0879f21715)
| -rw-r--r-- | pkgs/development/libraries/webkitgtk/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 2d6948d2ada0..5407a74ee2ba 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.40.1"; + version = "2.40.2"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-ZOUmmE+M0hYe8DrpSa+ZwAL/Mz1hXmOGtGAWSjwbfvY="; + hash = "sha256-lomIcNmU2kBu56YygW3N6aO7OV7l80T8s/O4zIp34AA="; }; patches = lib.optionals stdenv.isLinux [ @@ -173,13 +173,11 @@ stdenv.mkDerivation (finalAttrs: { install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h '' ) ++ lib.optionals stdenv.isLinux [ - bubblewrap libseccomp libmanette wayland libwpe libwpe-fdo - xdg-dbus-proxy ] ++ lib.optionals systemdSupport [ systemd ] ++ lib.optionals enableGeoLocation [ @@ -204,6 +202,11 @@ stdenv.mkDerivation (finalAttrs: { "-DUSE_LIBHYPHEN=OFF" "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}" "-DUSE_LIBSECRET=${cmakeBool withLibsecret}" + ] ++ lib.optionals stdenv.isLinux [ + # Have to be explicitly specified when cross. + # https://github.com/WebKit/WebKit/commit/a84036c6d1d66d723f217a4c29eee76f2039a353 + "-DBWRAP_EXECUTABLE=${lib.getExe bubblewrap}" + "-DDBUS_PROXY_EXECUTABLE=${lib.getExe xdg-dbus-proxy}" ] ++ lib.optionals stdenv.isDarwin [ "-DENABLE_GAMEPAD=OFF" "-DENABLE_GTKDOC=OFF" |