Author: urkud
Date: Sat Jan 7 19:42:56 2012
New Revision: 31414
URL: https://nixos.org/websvn/nix/?rev=31414&sc=1
Log:
Pass g-d-s to glib-networking, use ca-certificates
Modified:
nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-2/platform/glib-networking/default.nix
Modified:
nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-2/platform/glib-networking/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-2/platform/glib-networking/default.nix
Sat Jan 7 19:42:51 2012 (r31413)
+++
nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-2/platform/glib-networking/default.nix
Sat Jan 7 19:42:56 2012 (r31414)
@@ -1,24 +1,23 @@
{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls2, libproxy
- , libgcrypt, libtasn1
- }:
+, gsettings_desktop_schemas, libgcrypt, libtasn1, xz }:
stdenv.mkDerivation {
- name = "glib-networking-2.28.5";
-
+ name = "glib-networking-2.30.2";
+
src = fetchurl {
- url =
mirror://gnome/sources/glib-networking/2.28/glib-networking-2.28.5.tar.bz2;
- sha256 =
"959ffeb91fee17c1b0fb2aa82872c3daae0230de93708b2ebabeb92b747d7876";
+ url =
mirror://gnome/sources/glib-networking/2.30/glib-networking-2.30.2.tar.xz;
+ sha256 = "1g2ran0rn37009fs3xl38m95i5w8sdf9ax0ady4jbjir15844xcz";
};
- configureFlags = [
- "--without-ca-certificates"
- ];
+ configureFlags = "--with-ca-certificates=/etc/ca-bundle.crt";
preBuild = ''
sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find .
-name Makefile)
'';
- buildInputs = [ pkgconfig ];
- propagatedBuildInputs = [ glib libtool intltool gnutls2 libproxy libgcrypt
- libtasn1];
+ buildNativeInputs = [ pkgconfig xz ];
+ propagatedBuildInputs =
+ [ glib libtool intltool gnutls2 libproxy libgcrypt libtasn1
+ gsettings_desktop_schemas
+ ];
}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
