diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-09-05 00:51:03 +0000 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-11-30 21:34:28 +0100 |
commit | f78203de37b3f6bab1e534c5e4484e837057a6f6 (patch) | |
tree | fa64db4b0da95505637f1f860b0c1b9d20748d99 /pkgs/development/libraries/libsoup | |
parent | 6182a3fe4d77ff3b3dc7734e6f82470e76c426a6 (diff) | |
download | nixpkgs-f78203de37b3f6bab1e534c5e4484e837057a6f6.tar nixpkgs-f78203de37b3f6bab1e534c5e4484e837057a6f6.tar.gz nixpkgs-f78203de37b3f6bab1e534c5e4484e837057a6f6.tar.bz2 nixpkgs-f78203de37b3f6bab1e534c5e4484e837057a6f6.tar.lz nixpkgs-f78203de37b3f6bab1e534c5e4484e837057a6f6.tar.xz nixpkgs-f78203de37b3f6bab1e534c5e4484e837057a6f6.tar.zst nixpkgs-f78203de37b3f6bab1e534c5e4484e837057a6f6.zip |
libsoup: 2.62.2 → 2.64.2
Diffstat (limited to 'pkgs/development/libraries/libsoup')
-rw-r--r-- | pkgs/development/libraries/libsoup/default.nix | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 9849e2600bb..8cd43adbea9 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,39 +1,35 @@ -{ stdenv, fetchurl, glib, libxml2, pkgconfig, gnome3 -, gnomeSupport ? true, sqlite, glib-networking, gobjectIntrospection -, valaSupport ? true, vala_0_40 -, intltool, python3 }: +{ stdenv, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3 +, gnomeSupport ? true, sqlite, glib-networking, gobjectIntrospection, vala +, libpsl, python3 }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libsoup"; - version = "2.62.2"; + version = "2.64.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1dkrz1iwsswscayfmjxqv2q00b87snlq9nxdccn5vck0vbinylwy"; + sha256 = "1il6lyrmfi0hfh3ysw8w1qzc1rdz0igkb7dv6d8g5mmilnac3pbm"; }; postPatch = '' patchShebangs libsoup/ - '' + stdenv.lib.optionalString valaSupport '' - substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi" ''; outputs = [ "out" "dev" ]; - buildInputs = [ python3 sqlite ]; - nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ] - ++ stdenv.lib.optionals valaSupport [ vala_0_40 ]; + buildInputs = [ python3 sqlite libpsl ]; + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection vala ]; propagatedBuildInputs = [ glib libxml2 ]; - # glib-networking is a runtime dependency, not a compile-time dependency - configureFlags = [ - "--disable-tls-check" - "--enable-vala=${if valaSupport then "yes" else "no"}" - "--with-gnome=${if gnomeSupport then "yes" else "no"}" + mesonFlags = [ + "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency + "-Dgssapi=false" + "-Dvapi=true" + "-Dgnome=${if gnomeSupport then "true" else "false"}" ]; - doCheck = false; # fails with "no: command not found" + doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200) passthru = { propagatedUserEnvPackages = [ glib-networking.out ]; |