diff options
| -rw-r--r-- | pkgs/development/libraries/gpgme/default.nix | 32 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 15 insertions, 21 deletions
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 2ab0977004c..5601a8854ef 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,19 +1,11 @@ -{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan -, useGnupg1 ? false, gnupg1 ? null }: +{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan }: -assert useGnupg1 -> gnupg1 != null; -assert !useGnupg1 -> gnupg != null; - -let - gpgStorePath = if useGnupg1 then gnupg1 else gnupg; - gpgProgram = if useGnupg1 then "gpg" else "gpg2"; -in stdenv.mkDerivation rec { - name = "gpgme-1.8.0"; + name = "gpgme-1.9.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; - sha256 = "0csx3qnycwm0n90ql6gs65if5xi4gqyzzy21fxs2xqicghjrfq2r"; + sha256 = "1ssc0gs02r4fasabk7c6v6r865k2j02mpb5g1vkpbmzsigdzwa8v"; }; outputs = [ "out" "dev" "info" ]; @@ -24,20 +16,24 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gnupg ]; configureFlags = [ - "--enable-fixed-path=${gpgStorePath}/bin" + "--enable-fixed-path=${gnupg}/bin" ]; + # 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"; - AM_CXXFLAGS = - with stdenv; lib.optional (isDarwin) "-D_POSIX_C_SOURCE=200809L"; - meta = with stdenv.lib; { - homepage = "http://www.gnupg.org/related_software/gpgme"; + homepage = "https://gnupg.org/software/gpgme/index.html"; description = "Library for making GnuPG easier to use"; - license = licenses.gpl2; + longDescription = '' + GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG + easier for applications. It provides a High-Level Crypto API for + encryption, decryption, signing, signature verification and key + management. + ''; + license = with licenses; [ lgpl21Plus gpl3Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.fuuzetsu ]; + maintainers = with maintainers; [ fuuzetsu primeos ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f21f6a15330..5cf7986ca01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7709,9 +7709,7 @@ with pkgs; gpac = callPackage ../applications/video/gpac { }; - gpgme = callPackage ../development/libraries/gpgme { - gnupg1 = gnupg1orig; - }; + gpgme = callPackage ../development/libraries/gpgme { }; pgpdump = callPackage ../tools/security/pgpdump { }; |