ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

Remove gpg->gpg2 symlink

Browse Source 
Also make gpgme compile&find gpg2

svn path=/nixpkgs/trunk/; revision=21885
This commit is contained in:
Yury G. Kudryashov 2010-05-19 20:59:03 +00:00
parent d0b56edcf2
commit fd63f04e4e
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/gpgme/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth}: {stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gpgme-1.3.0"; name = "gpgme-1.3.0";
@ -6,5 +6,6 @@ stdenv.mkDerivation rec {
url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2"; url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2";
sha256 = "18g6wgiacnbj437yfsczbjxaf041ljia48dnv2qgcqb0sky41q3l"; sha256 = "18g6wgiacnbj437yfsczbjxaf041ljia48dnv2qgcqb0sky41q3l";
}; };
buildInputs = [libgpgerror gnupg pkgconfig glib pth]; buildInputs = [libgpgerror gnupg pkgconfig glib pth libassuan];
configureFlags = "--with-gpg=${gnupg}/bin/gpg2";
} }

5
pkgs/tools/security/gnupg/default.nix
View File

@ -31,11 +31,6 @@ stdenv.mkDerivation rec {
checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check"; checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check";
postInstall = ''
ln -s gpg2 $out/bin/gpg
ln -s gpgv2 $out/bin/gpgv
'';
doCheck = true; doCheck = true;
meta = { meta = {

2
pkgs/top-level/all-packages.nix
View File

@ -4034,7 +4034,7 @@ let
}; };
gpgme = import ../development/libraries/gpgme { gpgme = import ../development/libraries/gpgme {
inherit fetchurl stdenv libgpgerror pkgconfig pth gnupg glib; inherit fetchurl stdenv libgpgerror pkgconfig pth gnupg glib libassuan;
}; };
gsasl = import ../development/libraries/gsasl { gsasl = import ../development/libraries/gsasl {