0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Jan Tojnar 2021-09-29 18:37:45 +02:00
parent 8d4272fdf1
commit 21b1744593

View file

@ -15,6 +15,7 @@
, libnotify , libnotify
, gnutls , gnutls
, libgcrypt , libgcrypt
, libgpg-error
, gtk3 , gtk3
, wayland , wayland
, libwebp , libwebp
@ -41,6 +42,7 @@
, libGLU , libGLU
, mesa , mesa
, libintl , libintl
, lcms2
, libmanette , libmanette
, openjpeg , openjpeg
, enableGeoLocation ? true , enableGeoLocation ? true
@ -63,7 +65,7 @@ assert enableGeoLocation -> geoclue2 != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "webkitgtk"; pname = "webkitgtk";
version = "2.32.4"; version = "2.34.0";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -71,7 +73,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
sha256 = "1zfkfyhm4i7901pp32wcwcfxax69qgq5k44x0glwaywdg4zjvkh0"; sha256 = "sha256-iAyO5ib2cBn2dVfKCeWaI+zyReYPYXMhXxqII8sJrzQ=";
}; };
patches = lib.optionals stdenv.isLinux [ patches = lib.optionals stdenv.isLinux [
@ -140,8 +142,10 @@ stdenv.mkDerivation rec {
libGLU libGLU
mesa # for libEGL headers mesa # for libEGL headers
libgcrypt libgcrypt
libgpg-error
libidn libidn
libintl libintl
lcms2
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
libmanette libmanette
] ++ [ ] ++ [
@ -193,6 +197,7 @@ stdenv.mkDerivation rec {
"-DPORT=GTK" "-DPORT=GTK"
"-DUSE_LIBHYPHEN=OFF" "-DUSE_LIBHYPHEN=OFF"
"-DUSE_WPE_RENDERER=OFF" "-DUSE_WPE_RENDERER=OFF"
"-DUSE_SOUP2=${if lib.versions.major libsoup.version == "2" then "ON" else "OFF"}"
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
"-DENABLE_GAMEPAD=OFF" "-DENABLE_GAMEPAD=OFF"
"-DENABLE_GTKDOC=OFF" "-DENABLE_GTKDOC=OFF"