tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #234924 from bobby285271/upd/webkitgtk

webkitgtk: 2.40.1 → 2.40.2

authored by

Bobby Rong and committed by
GitHub 686e4f7f 8c61fb48

+7 -4
+7 -4
pkgs/development/libraries/webkitgtk/default.nix
··· 71 71 72 72 stdenv.mkDerivation (finalAttrs: { 73 73 pname = "webkitgtk"; 74 - version = "2.40.1"; 74 + version = "2.40.2"; 75 75 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"}"}"; 76 76 77 77 outputs = [ "out" "dev" "devdoc" ]; ··· 82 82 83 83 src = fetchurl { 84 84 url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; 85 - hash = "sha256-ZOUmmE+M0hYe8DrpSa+ZwAL/Mz1hXmOGtGAWSjwbfvY="; 85 + hash = "sha256-lomIcNmU2kBu56YygW3N6aO7OV7l80T8s/O4zIp34AA="; 86 86 }; 87 87 88 88 patches = lib.optionals stdenv.isLinux [ ··· 173 173 install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h 174 174 '' 175 175 ) ++ lib.optionals stdenv.isLinux [ 176 - bubblewrap 177 176 libseccomp 178 177 libmanette 179 178 wayland 180 179 libwpe 181 180 libwpe-fdo 182 - xdg-dbus-proxy 183 181 ] ++ lib.optionals systemdSupport [ 184 182 systemd 185 183 ] ++ lib.optionals enableGeoLocation [ ··· 202 204 "-DUSE_LIBHYPHEN=OFF" 203 205 "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}" 204 206 "-DUSE_LIBSECRET=${cmakeBool withLibsecret}" 207 + ] ++ lib.optionals stdenv.isLinux [ 208 + # Have to be explicitly specified when cross. 209 + # https://github.com/WebKit/WebKit/commit/a84036c6d1d66d723f217a4c29eee76f2039a353 210 + "-DBWRAP_EXECUTABLE=${lib.getExe bubblewrap}" 211 + "-DDBUS_PROXY_EXECUTABLE=${lib.getExe xdg-dbus-proxy}" 205 212 ] ++ lib.optionals stdenv.isDarwin [ 206 213 "-DENABLE_GAMEPAD=OFF" 207 214 "-DENABLE_GTKDOC=OFF"