public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-add GNU TLS 2.12 - it does fix glib-networking

Browse Source 
svn path=/nixpkgs/trunk/; revision=28853
This commit is contained in:
Michael Raskin
2011-08-27 17:04:25 +00:00
parent b14e107495
commit 6a49d6a920
4 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/gnome-2.28/default.nix
View File

@@ -143,7 +143,7 @@ pkgs.makeOverridable
};
glib_networking = import ./platform/glib-networking {
inherit (pkgs) stdenv fetchurl pkgconfig glib libtool intltool gnutls
inherit (pkgs) stdenv fetchurl pkgconfig glib libtool intltool gnutls2
libproxy libgcrypt libtasn1;
};

4
pkgs/desktops/gnome-2.28/platform/glib-networking/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls, libproxy
{stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls2, libproxy
, libgcrypt, libtasn1
}:
@@ -19,6 +19,6 @@ stdenv.mkDerivation {
'';
buildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib libtool intltool gnutls libproxy libgcrypt
propagatedBuildInputs = [ glib libtool intltool gnutls2 libproxy libgcrypt
libtasn1];
}