diff options
author | Joel Taylor <me@joelt.io> | 2014-08-17 13:17:13 -0700 |
---|---|---|
committer | Joel Taylor <me@joelt.io> | 2014-09-09 13:54:24 -0700 |
commit | 3e8344d334d42824ac3061a919ac15b19a1bf21d (patch) | |
tree | 5ecad4218357caec8ddc27d5df150a5734db0281 /pkgs/tools/security/gnupg | |
parent | e3fd4499ef296f4769cf4e9e91f1ccfd16325b0f (diff) | |
download | nixpkgs-3e8344d334d42824ac3061a919ac15b19a1bf21d.tar nixpkgs-3e8344d334d42824ac3061a919ac15b19a1bf21d.tar.gz nixpkgs-3e8344d334d42824ac3061a919ac15b19a1bf21d.tar.bz2 nixpkgs-3e8344d334d42824ac3061a919ac15b19a1bf21d.tar.lz nixpkgs-3e8344d334d42824ac3061a919ac15b19a1bf21d.tar.xz nixpkgs-3e8344d334d42824ac3061a919ac15b19a1bf21d.tar.zst nixpkgs-3e8344d334d42824ac3061a919ac15b19a1bf21d.zip |
suitable clang stdenv
Diffstat (limited to 'pkgs/tools/security/gnupg')
-rw-r--r-- | pkgs/tools/security/gnupg/clang.patch | 13 | ||||
-rw-r--r-- | pkgs/tools/security/gnupg/default.nix | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/tools/security/gnupg/clang.patch b/pkgs/tools/security/gnupg/clang.patch new file mode 100644 index 00000000000..842785e5c93 --- /dev/null +++ b/pkgs/tools/security/gnupg/clang.patch @@ -0,0 +1,13 @@ +diff --git a/gl/stdint_.h b/gl/stdint_.h +index bc27595..303e81a 100644 +--- a/gl/stdint_.h ++++ b/gl/stdint_.h +@@ -62,7 +62,7 @@ + int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__. + <inttypes.h> also defines intptr_t and uintptr_t. */ + # define _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H +-# include <inttypes.h> ++// # include <inttypes.h> + # undef _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H + #elif @HAVE_SYS_INTTYPES_H@ + /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix index 64e2be90d30..e00985b16ed 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { patchPhase = '' find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i find . -name pcsc-wrapper.c | xargs sed -i 's/typedef unsinged int pcsc_dword_t/typedef unsigned int pcsc_dword_t/' + patch gl/stdint_.h < ${./clang.patch} ''; checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check"; |