diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-09 10:31:12 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:44:44 -0500 |
| commit | f5c00c43bb6d4a4a09e4b4a8a273833deba994cc (patch) | |
| tree | 8f964095bea398e4b6797030f35f1646714237ec /pkgs/development/libraries/gpgme | |
| parent | 05ef92e53a325aabd51bd7820a46d1359a53de2e (diff) | |
| download | nixpkgs-f5c00c43bb6d4a4a09e4b4a8a273833deba994cc.tar nixpkgs-f5c00c43bb6d4a4a09e4b4a8a273833deba994cc.tar.gz nixpkgs-f5c00c43bb6d4a4a09e4b4a8a273833deba994cc.tar.bz2 nixpkgs-f5c00c43bb6d4a4a09e4b4a8a273833deba994cc.tar.lz nixpkgs-f5c00c43bb6d4a4a09e4b4a8a273833deba994cc.tar.xz nixpkgs-f5c00c43bb6d4a4a09e4b4a8a273833deba994cc.tar.zst nixpkgs-f5c00c43bb6d4a4a09e4b4a8a273833deba994cc.zip | |
qgpgme: init at 1.9.0
Diffstat (limited to 'pkgs/development/libraries/gpgme')
| -rw-r--r-- | pkgs/development/libraries/gpgme/default.nix | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 36d90604a82..8ae88944dd1 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan, qt5 }: +{ stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan +, qtbase ? null }: + +let inherit (stdenv) lib system; in stdenv.mkDerivation rec { name = "gpgme-1.9.0"; @@ -8,10 +11,20 @@ stdenv.mkDerivation rec { sha256 = "1ssc0gs02r4fasabk7c6v6r865k2j02mpb5g1vkpbmzsigdzwa8v"; }; + patches = [ + (fetchpatch { + url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=5d4f977dac542340c877fdd4b1304fa8f6e058e6"; + sha256 = "0swpxzd3x3b6h2ry2py9j8l0xp3vdw8rixxhgfavzia5p869qyyx"; + name = "qgpgme-format-security.patch"; + }) + ]; + outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool - propagatedBuildInputs = [ libgpgerror glib libassuan pth qt5.qtbase ]; + propagatedBuildInputs = + [ libgpgerror glib libassuan pth ] + ++ lib.optional (qtbase != null) qtbase; nativeBuildInputs = [ pkgconfig gnupg ]; @@ -19,11 +32,9 @@ stdenv.mkDerivation rec { "--enable-fixed-path=${gnupg}/bin" ]; - patches = [ ./gpgme_libsuffix.patch ]; - # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html NIX_CFLAGS_COMPILE = - with stdenv; lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; + lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; meta = with stdenv.lib; { homepage = "https://gnupg.org/software/gpgme/index.html"; |