diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-25 00:13:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-25 00:13:49 +0000 |
| commit | 257171f024023815158819b0cb35b5958f1b4975 (patch) | |
| tree | 91f9a728162c7e67be0ebf5602148377f1841da1 /pkgs/development/libraries/gpgme/default.nix | |
| parent | 57bbe4245f80b90b4b48079750f91bdc0437c66e (diff) | |
| parent | 7794d8a78570335f10b0f97ae72b14b33c6addc2 (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/libraries/gpgme/default.nix')
| -rw-r--r-- | pkgs/development/libraries/gpgme/default.nix | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index ca359fcc912b6..c712b5195dc52 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , autoreconfHook , libgpg-error , gnupg @@ -9,7 +8,6 @@ , glib , pth , libassuan -, file , which , ncurses , texinfo @@ -22,28 +20,34 @@ , qt6Packages , python3 }: -let - inherit (stdenv.hostPlatform) system; -in + stdenv.mkDerivation rec { pname = "gpgme"; version = "1.23.2"; + pyproject = true; + + outputs = [ "out" "dev" "info" ]; + + outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool src = fetchurl { - url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2"; + url = "mirror://gnupg/gpgme/gpgme-${version}.tar.bz2"; hash = "sha256-lJnosfM8zLaBVSehvBYEnTWmGYpsX64BhfK9VhvOUiQ="; }; patches = [ - # Support Python 3.10 version detection without distutils, https://dev.gnupg.org/D545 - ./python-310-detection-without-distutils.patch + # Support Python 3.10-3.12, remove distutils, https://dev.gnupg.org/D545 + ./python-310-312-remove-distutils.patch # Fix a test after disallowing compressed signatures in gpg (PR #180336) ./test_t-verify_double-plaintext.patch ]; - outputs = [ "out" "dev" "info" ]; - - outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool + postPatch = '' + # autoconf's beta detection requires a git repo to work + # and otherwise appends -unknown to the version number used in the python package which pip stumbles upon + substituteInPlace autogen.sh \ + --replace-fail 'tmp="-unknown"' 'tmp=""' + ''; nativeBuildInputs = [ autoreconfHook @@ -52,6 +56,9 @@ stdenv.mkDerivation rec { texinfo ] ++ lib.optionals pythonSupport [ python3.pythonOnBuildForHost + python3.pkgs.pip + python3.pkgs.setuptools + python3.pkgs.wheel ncurses swig2 which |