libsoup: update from 2.44.1 to 2.44.2

Enable introspection
Renamed from libsoup_2_40 to libsoup_2_44
This commit is contained in:
Song Wenwu 2013-12-05 23:12:00 +08:00 committed by Vladimír Čunát
parent 8dc05a8fc9
commit 7ae520404f
2 changed files with 17 additions and 14 deletions

View File

@ -1,32 +1,35 @@
{ stdenv, fetchurl, pkgconfig, glib, libxml2, sqlite, intltool, python
, gnomeSupport ? true, libgnome_keyring, glib_networking
{ stdenv, fetchurl, pkgconfig, intltool, python, gobjectIntrospection
, glib, libxml2, sqlite, glib_networking
, gnomeSupport ? true, libgnome_keyring
}:
stdenv.mkDerivation {
name = "libsoup-2.44.1";
name = "libsoup-2.44.2";
src = fetchurl {
url = mirror://gnome/sources/libsoup/2.44/libsoup-2.44.1.tar.xz;
sha256 = "07acjwvik3gagcsdjzi85g44ga4pd3nh4ww6722bfzjzvlqw6cn5";
meta = {
description = "HTTP client/server library";
license = stdenv.lib.licenses.lgpl2Plus;
};
src = fetchurl {
url = mirror://gnome/sources/libsoup/2.44/libsoup-2.44.2.tar.xz;
sha256 = "1wwqsmi1jvidiqwbdnjl66nmk1yja8w9dxf9cz10zh56fjmvbr77";
};
preConfigure = ''
substituteInPlace libsoup/tld-parser.py \
--replace "!/usr/bin/env python" "!${python}/bin/${python.executable}"
'';
buildInputs = [ pkgconfig intltool python ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig intltool python gobjectIntrospection ];
propagatedBuildInputs = [ glib libxml2 sqlite ]
++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ];
passthru.propagatedUserEnvPackages = [ glib_networking ];
# glib_networking is a runtime dependency, not a compile-time dependency
configureFlags = "--disable-tls-check";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
meta = {
# inherit (glib.meta) maintainers platforms;
};
}

View File

@ -4202,7 +4202,7 @@ let
geoclue = callPackage ../development/libraries/geoclue {};
geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {
libsoup = libsoup_2_40;
libsoup = libsoup_2_44;
};
geoip = builderDefsPackage ../development/libraries/geoip {
@ -5050,7 +5050,7 @@ let
libsodium = callPackage ../development/libraries/libsodium { };
libsoup = callPackage ../development/libraries/libsoup { };
libsoup_2_40 = callPackage ../development/libraries/libsoup/2.40.nix { };
libsoup_2_44 = callPackage ../development/libraries/libsoup/2.44.nix { };
libssh = callPackage ../development/libraries/libssh { };