Author: urkud
Date: Sat Jan 7 19:43:25 2012
New Revision: 31419
URL: https://nixos.org/websvn/nix/?rev=31419&sc=1
Log:
libsoup-2.36.1
Modified:
nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-2/desktop/libsoup/default.nix
Modified:
nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-2/desktop/libsoup/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-2/desktop/libsoup/default.nix
Sat Jan 7 19:43:21 2012 (r31418)
+++
nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-2/desktop/libsoup/default.nix
Sat Jan 7 19:43:25 2012 (r31419)
@@ -1,12 +1,24 @@
-{stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl,
- glib, GConf, gnome_keyring}:
+{ stdenv, fetchurl, glib, libxml2, pkgconfig, xz
+, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }:
+
+stdenv.mkDerivation {
+ name = "libsoup-2.36.1";
-stdenv.mkDerivation rec {
- name = "libsoup-2.33.6";
src = fetchurl {
- url = "mirror://gnome/sources/libsoup/2.33/${name}.tar.bz2";
- sha256 =
"988f7897fe125a77a5946b2fd6d47d7374fd94a1406e810482cfff6a52a6a923";
+ url = mirror://gnome/sources/libsoup/2.36/libsoup-2.36.1.tar.xz;
+ sha256 = "0r8zkr0a328jkww4dv9z1q691rw59nh4lf5f5pzzr9szzw3j8wkk";
+ };
+
+
+ buildNativeInputs = [ pkgconfig xz ];
+ 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;
};
- buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl
- glib GConf gnome_keyring ];
}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
