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

gpg/pth: fixing the pth building on arm

Browse Source 
I could built pth with the fix commented in:
http://forums.gentoo.org/viewtopic-t-904280-start-0.html

And I remove the 'pth.supported' structure I had built.
This commit is contained in:
Lluis Batlle
2012-11-15 12:38:18 +01:00
parent 086e1e84fa
commit d2d761b692
5 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/gpgme/default.nix
+13 -4
View File
@@ -1,5 +1,15 @@
{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan }:
{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
, useGnupg1 ? false, gnupg1 ? null }:
assert useGnupg1 -> gnupg1 != null;
assert !useGnupg1 -> gnupg != null;
let
gpgPath = if useGnupg1 then
"${gnupg1}/bin/gpg"
else
"${gnupg}/bin/gpg2";
in
stdenv.mkDerivation rec {
name = "gpgme-1.3.1";
@@ -8,10 +18,9 @@ stdenv.mkDerivation rec {
sha256 = "1m7l7nicn6gd952cgspv9xr8whqivbg33nbg8kbpj3dffnl2gvqm";
};
propagatedBuildInputs = [ libgpgerror glib libassuan ]
++ stdenv.lib.optional pth.supported pth;
propagatedBuildInputs = [ libgpgerror glib libassuan pth ];
buildNativeInputs = [ pkgconfig ];
configureFlags = "--with-gpg=${gnupg}/bin/gpg2";
configureFlags = "--with-gpg=${gpgPath}";
}