diff options
| author | Lluis Batlle <viriketo@gmail.com> | 2012-11-14 23:20:47 +0100 |
|---|---|---|
| committer | Lluis Batlle <viriketo@gmail.com> | 2012-11-14 23:20:47 +0100 |
| commit | 66ceb14b5ecb06538105fce66f12bc17828554d5 (patch) | |
| tree | d4fb99e730de7b29d4a30f0a5aca494cf59f609f | |
| parent | 677946fedea043bc18b930908f6fa866dba799e7 (diff) | |
| download | nixlib-66ceb14b5ecb06538105fce66f12bc17828554d5.tar nixlib-66ceb14b5ecb06538105fce66f12bc17828554d5.tar.gz nixlib-66ceb14b5ecb06538105fce66f12bc17828554d5.tar.bz2 nixlib-66ceb14b5ecb06538105fce66f12bc17828554d5.tar.lz nixlib-66ceb14b5ecb06538105fce66f12bc17828554d5.tar.xz nixlib-66ceb14b5ecb06538105fce66f12bc17828554d5.tar.zst nixlib-66ceb14b5ecb06538105fce66f12bc17828554d5.zip | |
pth, gpg: taking out pth in non-supported platforms.
I know that pth fails to build on arm, by now.
| -rw-r--r-- | pkgs/development/libraries/gpgme/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/libassuan/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/pth/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/gnupg/default.nix | 3 |
4 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 582208f08b67..9dba035d15f2 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -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 ]; diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 362ecd403d2e..619ef4d97fb4 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "06xckkvxxlx7cj77803m8x58gxksap4k8yhspc5cqsy7fhinimds"; }; - propagatedBuildInputs = [ pth libgpgerror ]; + propagatedBuildInputs = [ libgpgerror ] + ++ stdenv.lib.optional pth.supported pth; doCheck = true; diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index ffd81f84489d..cd20af5bb07b 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -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; diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix index 0667a7f9885c..8b528e15c059 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -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 |