diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2010-07-08 09:02:10 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2010-07-08 09:02:10 +0000 |
| commit | b3378524fa44e2420aab72c81656105b6560bf96 (patch) | |
| tree | a94934cdc9a744818f08cd847893a6810e908f0b /pkgs | |
| parent | 6be9a7692a52e1e2563f62c8165e4921e1da6639 (diff) | |
| download | nixlib-b3378524fa44e2420aab72c81656105b6560bf96.tar nixlib-b3378524fa44e2420aab72c81656105b6560bf96.tar.gz nixlib-b3378524fa44e2420aab72c81656105b6560bf96.tar.bz2 nixlib-b3378524fa44e2420aab72c81656105b6560bf96.tar.lz nixlib-b3378524fa44e2420aab72c81656105b6560bf96.tar.xz nixlib-b3378524fa44e2420aab72c81656105b6560bf96.tar.zst nixlib-b3378524fa44e2420aab72c81656105b6560bf96.zip | |
Add libsoup 2.31 - may work better with GnuTLS update
svn path=/nixpkgs/trunk/; revision=22523
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-2.28/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix | 12 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index e1c4154e01e4..1c358b591a6b 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -182,6 +182,12 @@ rec { inherit GConf gnome_keyring; }; + libsoup_2_31 = import ./desktop/libsoup/2.31.nix { + inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite curl; + inherit (pkgs.gtkLibs) glib; + inherit GConf gnome_keyring; + }; + libwnck = import ./desktop/libwnck { inherit (pkgs) stdenv fetchurl pkgconfig; inherit (pkgs.xlibs) libX11; diff --git a/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix b/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix new file mode 100644 index 000000000000..cc1b6467d8c6 --- /dev/null +++ b/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix @@ -0,0 +1,12 @@ +{stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl, + glib, GConf, gnome_keyring}: + +stdenv.mkDerivation { + name = "libsoup-2.31.2"; + src = fetchurl { + url = mirror://gnome/sources/libsoup/2.31/libsoup-2.31.2.tar.bz2; + sha256 = "ae52e970deb0ca5e890d87cf55e555249c086bd56ae1fff69599174ca0075379"; + }; + buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl + glib GConf gnome_keyring ]; +} |