Author: raskin
Date: 2010-07-08 09:02:10 +0000 (Thu, 08 Jul 2010)
New Revision: 22523

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22523&view=rev

Added:
   nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix
Modified:
   nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix

Log:
Add libsoup 2.31 - may work better with GnuTLS update

Changes:

Modified: nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix
===================================================================
--- nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix  2010-07-08 08:35:04 UTC 
(rev 22522)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix  2010-07-08 09:02:10 UTC 
(rev 22523)
@@ -182,6 +182,12 @@
     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;

Copied: nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix (from 
rev 22498, nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix)
===================================================================
--- nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix             
                (rev 0)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix     
2010-07-08 09:02:10 UTC (rev 22523)
@@ -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 ];
+}

_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to