ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues 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 11:18:38 +01:00
parent 086e1e84fa
commit d2d761b692
5 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/gpgme/default.nix
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 { stdenv.mkDerivation rec {
name = "gpgme-1.3.1"; name = "gpgme-1.3.1";
@ -8,10 +18,9 @@ stdenv.mkDerivation rec {
sha256 = "1m7l7nicn6gd952cgspv9xr8whqivbg33nbg8kbpj3dffnl2gvqm"; sha256 = "1m7l7nicn6gd952cgspv9xr8whqivbg33nbg8kbpj3dffnl2gvqm";
}; };
propagatedBuildInputs = [ libgpgerror glib libassuan ] propagatedBuildInputs = [ libgpgerror glib libassuan pth ];
++ stdenv.lib.optional pth.supported pth;
buildNativeInputs = [ pkgconfig ]; buildNativeInputs = [ pkgconfig ];
configureFlags = "--with-gpg=${gnupg}/bin/gpg2"; configureFlags = "--with-gpg=${gpgPath}";
} }

3
pkgs/development/libraries/libassuan/default.nix
View File

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

6
pkgs/development/libraries/pth/default.nix
View File

@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"; sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj";
}; };
passthru = { preConfigure = stdenv.lib.optionalString stdenv.isArm ''
supported = ! stdenv.isArm; configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9")
}; '';
meta = { meta = {
description = "The GNU Portable Threads library"; description = "The GNU Portable Threads library";

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

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

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

@ -3839,7 +3839,9 @@ let
gnutls_without_guile = gnutls.override { guileBindings = false; }; gnutls_without_guile = gnutls.override { guileBindings = false; };
gnutls2_without_guile = gnutls2.override { guileBindings = false; }; gnutls2_without_guile = gnutls2.override { guileBindings = false; };
gpgme = callPackage ../development/libraries/gpgme { }; gpgme = callPackage ../development/libraries/gpgme {
gnupg1 = gnupg1orig;
};
grantlee = callPackage ../development/libraries/grantlee { }; grantlee = callPackage ../development/libraries/grantlee { };