diff options
author | Song Wenwu <iyzsong@gmail.com> | 2013-12-05 23:12:00 +0800 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-10 10:48:59 +0100 |
commit | 7ae520404f715aa79aa42ecd3ceaf82e454e1292 (patch) | |
tree | d672809c5615347dfb99c61c82f52e83610b4ac1 | |
parent | 8dc05a8fc903fa1d8a9833196b2ad153a1d90aa8 (diff) | |
download | nixlib-7ae520404f715aa79aa42ecd3ceaf82e454e1292.tar nixlib-7ae520404f715aa79aa42ecd3ceaf82e454e1292.tar.gz nixlib-7ae520404f715aa79aa42ecd3ceaf82e454e1292.tar.bz2 nixlib-7ae520404f715aa79aa42ecd3ceaf82e454e1292.tar.lz nixlib-7ae520404f715aa79aa42ecd3ceaf82e454e1292.tar.xz nixlib-7ae520404f715aa79aa42ecd3ceaf82e454e1292.tar.zst nixlib-7ae520404f715aa79aa42ecd3ceaf82e454e1292.zip |
libsoup: update from 2.44.1 to 2.44.2
Enable introspection Renamed from libsoup_2_40 to libsoup_2_44
-rw-r--r-- | pkgs/development/libraries/libsoup/2.44.nix (renamed from pkgs/development/libraries/libsoup/2.40.nix) | 27 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 17 insertions, 14 deletions
diff --git a/pkgs/development/libraries/libsoup/2.40.nix b/pkgs/development/libraries/libsoup/2.44.nix index ca37ceb941c8..4bef93ff8cd7 100644 --- a/pkgs/development/libraries/libsoup/2.40.nix +++ b/pkgs/development/libraries/libsoup/2.44.nix @@ -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; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eccce1181dec..5a5ca07ba18b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |