diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-09 07:13:08 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-09 07:13:08 +0000 |
commit | 91fb91d9e03f2082e5008ac85c2fba9ab779aade (patch) | |
tree | fdebb58c3ae2e250582f5d265ad29323ddb150e4 /pkgs | |
parent | 1f84acc1133d93e8dc1ab4fec73f54263da88884 (diff) | |
download | nixpkgs-91fb91d9e03f2082e5008ac85c2fba9ab779aade.tar nixpkgs-91fb91d9e03f2082e5008ac85c2fba9ab779aade.tar.gz nixpkgs-91fb91d9e03f2082e5008ac85c2fba9ab779aade.tar.bz2 nixpkgs-91fb91d9e03f2082e5008ac85c2fba9ab779aade.tar.lz nixpkgs-91fb91d9e03f2082e5008ac85c2fba9ab779aade.tar.xz nixpkgs-91fb91d9e03f2082e5008ac85c2fba9ab779aade.tar.zst nixpkgs-91fb91d9e03f2082e5008ac85c2fba9ab779aade.zip |
libsoup-2.36.1
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32944
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/desktops/gnome-2/desktop/libsoup/default.nix | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/pkgs/desktops/gnome-2/desktop/libsoup/default.nix b/pkgs/desktops/gnome-2/desktop/libsoup/default.nix index a598bd01142..861f41cb7a4 100644 --- a/pkgs/desktops/gnome-2/desktop/libsoup/default.nix +++ b/pkgs/desktops/gnome-2/desktop/libsoup/default.nix @@ -1,16 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl -, glib, GConf, libgnome_keyring }: +{ stdenv, fetchurl, glib, libxml2, pkgconfig +, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }: -stdenv.mkDerivation rec { - name = "libsoup-2.34.3"; +stdenv.mkDerivation { + name = "libsoup-2.36.1"; src = fetchurl { - url = mirror://gnome/sources/libsoup/2.34/libsoup-2.34.3.tar.xz; - sha256 = "072af1iqcky5vm6akm450qhdjrgav4yyl6s8idhnq0gpm5jqhgy4"; + url = mirror://gnome/sources/libsoup/2.36/libsoup-2.36.1.tar.xz; + sha256 = "0r8zkr0a328jkww4dv9z1q691rw59nh4lf5f5pzzr9szzw3j8wkk"; }; - buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl - glib GConf libgnome_keyring ]; + buildNativeInputs = [ pkgconfig ]; + propagatedBuildInputs = [ glib libxml2 ] + ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ]; + passthru.propagatedUserEnvPackages = [ glib_networking ]; + + # glib_networking is a runtime dependency, not a compile-time dependency configureFlags = "--disable-tls-check"; + + meta = { + inherit (glib.meta) maintainers platforms; + }; } |