colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #234924 from bobby285271/upd/webkitgtk

Browse Source 
webkitgtk: 2.40.1 → 2.40.2
This commit is contained in:
Bobby Rong 2023-05-31 18:37:51 +08:00 committed by GitHub
commit 686e4f7fe0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/webkitgtk/default.nix
View File

@ -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"