summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2008-01-28 19:46:13 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2008-01-28 19:46:13 +0000
commit8e8e7f88279eb6c8fcf770f00e73cab981037c6a (patch)
tree955f4c07bbd4e65728076987a7649a15f9051613 /pkgs
parentb85bd7a25e7992ca65f6b09e40d7cfffe8942f9b (diff)
downloadnixpkgs-8e8e7f88279eb6c8fcf770f00e73cab981037c6a.tar
nixpkgs-8e8e7f88279eb6c8fcf770f00e73cab981037c6a.tar.gz
nixpkgs-8e8e7f88279eb6c8fcf770f00e73cab981037c6a.tar.bz2
nixpkgs-8e8e7f88279eb6c8fcf770f00e73cab981037c6a.tar.lz
nixpkgs-8e8e7f88279eb6c8fcf770f00e73cab981037c6a.tar.xz
nixpkgs-8e8e7f88279eb6c8fcf770f00e73cab981037c6a.tar.zst
nixpkgs-8e8e7f88279eb6c8fcf770f00e73cab981037c6a.zip
More dependencies for gpgme
svn path=/nixpkgs/trunk/; revision=10347
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/gpgme/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix3
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 68bbbc40904..64f1a746b03 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libgpgerror, gnupg}:
+args: with args;
 
 stdenv.mkDerivation {
   name = "gpgme-1.1.4";
@@ -6,5 +6,5 @@ stdenv.mkDerivation {
     url = ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.1.4.tar.bz2;
     sha256 = "0ncrv7p33rjq1avkxpp9x0gz6wna9y3b3dmw6nv366n5mgvxmpg8";
   };
-  buildInputs = [libgpgerror gnupg];
+  buildInputs = [libgpgerror gnupg gnupg2 pkgconfig glib pth];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74899af32c4..70be88a4f59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1975,7 +1975,8 @@ rec {
   };
 
   gpgme = import ../development/libraries/gpgme {
-    inherit fetchurl stdenv libgpgerror gnupg;
+    inherit fetchurl stdenv libgpgerror pkgconfig pth gnupg gnupg2;
+	inherit (gtkLibs) glib;
   };
 
   # gnu scientific library