Skip to content

webkitgtk: 2.44.3 → 2.46.0 #342812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bobby285271 merged 2 commits into from
Sep 27, 2024
Merged

webkitgtk: 2.44.3 → 2.46.0 #342812

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f968afe
webkitgtk: 2.44.3 → 2.46.0
bobby285271 Sep 16, 2024
093f67c
webkitgtk: Enable hyphen again
bobby285271 Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions pkgs/development/libraries/webkitgtk/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,14 @@
, libepoxy
, libjxl
, at-spi2-core
, cairo
, libxml2
, libsoup
, libsecret
, libxslt
, harfbuzz
, hyphen
, libsysprof-capture
, libpthreadstubs
, nettle
, libtasn1
Expand All @@ -50,6 +53,8 @@
, libmanette
, geoclue2
, flite
, fontconfig
, freetype
, openssl
, sqlite
, gst-plugins-base
Expand All @@ -73,7 +78,7 @@

stdenv.mkDerivation (finalAttrs: {
pname = "webkitgtk";
version = "2.44.3";
version = "2.46.0";
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" ];
Expand All @@ -84,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {

src = fetchurl {
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
hash = "sha256-3ILQQuysqYGkhSNXwG5SNXQzGc8QqUzTatQbl4g6C1Q=";
hash = "sha256-1NQzBA8ZAVFWDFC96ECFAIn4e61P76nr20quhWo99Do=";
};

patches = lib.optionals stdenv.hostPlatform.isLinux [
Expand Down Expand Up @@ -124,6 +129,7 @@ stdenv.mkDerivation (finalAttrs: {

buildInputs = [
at-spi2-core
cairo # required even when using skia
enchant2
libavif
libepoxy
Expand All @@ -132,6 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
gst-plugins-bad
gst-plugins-base
harfbuzz
hyphen
libGL
libGLU
mesa # for libEGL headers
Expand All @@ -141,6 +148,7 @@ stdenv.mkDerivation (finalAttrs: {
libintl
lcms2
libpthreadstubs
libsysprof-capture
libtasn1
libwebp
libxkbcommon
Expand All @@ -151,6 +159,10 @@ stdenv.mkDerivation (finalAttrs: {
p11-kit
sqlite
woff2
] ++ lib.optionals stdenv.hostPlatform.isBigEndian [
# https://bugs.webkit.org/show_bug.cgi?id=274032
fontconfig
freetype
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
libedit
readline
Expand Down Expand Up @@ -196,7 +208,6 @@ stdenv.mkDerivation (finalAttrs: {
[
"-DENABLE_INTROSPECTION=ON"
"-DPORT=GTK"
"-DUSE_LIBHYPHEN=OFF"
"-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}"
"-DUSE_LIBSECRET=${cmakeBool withLibsecret}"
"-DENABLE_EXPERIMENTAL_FEATURES=${cmakeBool enableExperimental}"
Expand Down