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

GnuTLS now introduces a dependency on gmp.

Browse Source 
-- also removed poorly considered earlier individual patches.

svn path=/nixpkgs/trunk/; revision=26810
This commit is contained in:
Karn Kallio 2011-04-12 16:59:52 +00:00
parent f54bea2a72
commit 422455271c
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,7 +179,7 @@ pkgs.makeOverridable
libsoup = import ./desktop/libsoup { libsoup = import ./desktop/libsoup {
inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite
curl libgcrypt gmp; curl libgcrypt;
inherit (pkgs.gtkLibs) glib; inherit (pkgs.gtkLibs) glib;
inherit GConf gnome_keyring; inherit GConf gnome_keyring;
}; };

4
pkgs/desktops/gnome-2.28/desktop/libsoup/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl { stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl
, glib, GConf, gnome_keyring, libgcrypt, gmp }: , glib, GConf, gnome_keyring, libgcrypt }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libsoup-2.28.2"; name = "libsoup-2.28.2";
@ -8,5 +8,5 @@ stdenv.mkDerivation {
sha256 = "002kxjh6dwpps4iwly1bazxlzgqhkfszqqy26mp1gy2il3lzrlcx"; sha256 = "002kxjh6dwpps4iwly1bazxlzgqhkfszqqy26mp1gy2il3lzrlcx";
}; };
buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl
glib GConf gnome_keyring libgcrypt gmp ]; glib GConf gnome_keyring libgcrypt ];
} }

4
pkgs/development/libraries/gnutls/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle { fetchurl, stdenv, zlib, lzo, libtasn1, nettle
, guileBindings, guile }: , guileBindings, guile, gmp }:
assert guileBindings -> guile != null; assert guileBindings -> guile != null;
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib lzo libtasn1 ] buildInputs = [ zlib lzo libtasn1 ]
++ stdenv.lib.optional guileBindings guile; ++ stdenv.lib.optional guileBindings guile;
propagatedBuildInputs = [ nettle ]; propagatedBuildInputs = [ nettle gmp ];
doCheck = true; doCheck = true;

4
pkgs/development/libraries/libimobiledevice/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, python, swig, pkgconfig, usbmuxd, glib, gnutls, libgcrypt, { stdenv, fetchurl, python, swig, pkgconfig, usbmuxd, glib, gnutls, libgcrypt,
libtasn1, libplist, readline, gmp }: libtasn1, libplist, readline }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libimobiledevice-1.0.2"; name = "libimobiledevice-1.0.2";
buildInputs = [ python swig pkgconfig readline gmp ]; buildInputs = [ python swig pkgconfig readline ];
propagatedBuildInputs = [ usbmuxd glib gnutls libgcrypt libtasn1 libplist ]; propagatedBuildInputs = [ usbmuxd glib gnutls libgcrypt libtasn1 libplist ];
configureFlags = "--enable-dev-tools"; configureFlags = "--enable-dev-tools";

4
pkgs/tools/networking/network-manager/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus, dbus_glib { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus, dbus_glib
, udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, iptables, libtasn1 , udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, iptables, libtasn1
, libgcrypt, gmp }: , libgcrypt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "network-manager-${version}"; name = "network-manager-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
"--with-crypto=gnutls" "--disable-more-warnings" "--with-crypto=gnutls" "--disable-more-warnings"
"--with-udev-dir=\${out}/lib/udev" ]; "--with-udev-dir=\${out}/lib/udev" ];
buildInputs = [ intltool wirelesstools pkgconfig dbus dbus_glib udev libnl1 libuuid polkit gnutls ppp libtasn1 libgcrypt gmp ]; buildInputs = [ intltool wirelesstools pkgconfig dbus dbus_glib udev libnl1 libuuid polkit gnutls ppp libtasn1 libgcrypt ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://projects.gnome.org/NetworkManager/; homepage = http://projects.gnome.org/NetworkManager/;