libsoup: 2.66.2 -> 2.68.1

This commit is contained in:
Tor Hedin Brønner 2019-09-09 21:48:04 +02:00
parent d5491d49b2
commit 7a4bbf6895

View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3 { stdenv, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3
, gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala , gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala
, libpsl, python3 }: , libpsl, python3, brotli }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libsoup"; pname = "libsoup";
version = "2.66.2"; version = "2.68.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx"; sha256 = "13dz7x092yswdidj69hadzqfyv6cyfnjbzidjym7nycf7gjj60vz";
}; };
postPatch = '' postPatch = ''
@ -17,15 +17,16 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
buildInputs = [ python3 sqlite libpsl ]; buildInputs = [ python3 sqlite libpsl brotli ];
nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala ]; nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala ];
propagatedBuildInputs = [ glib libxml2 ]; propagatedBuildInputs = [ glib libxml2 ];
mesonFlags = [ mesonFlags = [
"-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency
"-Dgssapi=false" "-Dgssapi=disabled"
"-Dvapi=true" "-Dvapi=enabled"
"-Dgnome=${if gnomeSupport then "true" else "false"}" "-Dgnome=${if gnomeSupport then "true" else "false"}"
"-Dntlm=disabled"
]; ];
doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200) doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200)