pth, gpg: taking out pth in non-supported platforms.

I know that pth fails to build on arm, by now.
This commit is contained in:
Lluis Batlle 2012-11-14 23:20:47 +01:00
parent 677946fede
commit 66ceb14b5e
4 changed files with 10 additions and 3 deletions

View File

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1m7l7nicn6gd952cgspv9xr8whqivbg33nbg8kbpj3dffnl2gvqm";
};
propagatedBuildInputs = [ libgpgerror glib pth libassuan ];
propagatedBuildInputs = [ libgpgerror glib libassuan ]
++ stdenv.lib.optional pth.supported pth;
buildNativeInputs = [ pkgconfig ];

View File

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "06xckkvxxlx7cj77803m8x58gxksap4k8yhspc5cqsy7fhinimds";
};
propagatedBuildInputs = [ pth libgpgerror ];
propagatedBuildInputs = [ libgpgerror ]
++ stdenv.lib.optional pth.supported pth;
doCheck = true;

View File

@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj";
};
passthru = {
supported = ! stdenv.isArm;
};
meta = {
description = "The GNU Portable Threads library";
homepage = http://www.gnu.org/software/pth;

View File

@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
sha256 = "08n636sfffs5qvg9ppiprvsh00q0dmdw425psg3m3nssja53m8pg";
};
buildInputs = [ readline zlib libgpgerror pth libgcrypt libassuan libksba ]
buildInputs = [ readline zlib libgpgerror libgcrypt libassuan libksba ]
++ stdenv.lib.optional pth.supported pth
++ stdenv.lib.optional useLdap openldap
++ stdenv.lib.optional useBzip2 bzip2
++ stdenv.lib.optional useUsb libusb