From 08c78eaa64c0761ed7778fc5b10799c395efe7aa Mon Sep 17 00:00:00 2001
From: Adam Joseph <adam@westernsemico.com>
Date: Fri, 14 Apr 2023 00:08:27 -0700
Subject: [PATCH] gpgme: fix cross, drop python2

This package very confusingly takes both python(2) and python3 as
arguments, and then mixes them up via an overlay in python-packages.
Since python2 is now marked INSECURE, let's just stick with python3.

Also fixes cross compilation.
---
 pkgs/development/libraries/gpgme/default.nix | 7 +++++--
 pkgs/top-level/python-packages.nix           | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 2079123ed1a3..a2b7daa28de1 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -17,7 +17,6 @@
 , qtbase ? null
 , pythonSupport ? false
 , swig2 ? null
-, python ? null
 # only for passthru.tests
 , libsForQt5
 , python3
@@ -51,12 +50,16 @@ stdenv.mkDerivation rec {
     pkg-config
     texinfo
   ] ++ lib.optionals pythonSupport [
+    python3.pythonForBuild
     ncurses
-    python
     swig2
     which
   ];
 
+  buildInputs = lib.optionals pythonSupport [
+    python3
+  ];
+
   propagatedBuildInputs = [
     glib
     libassuan
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index acf33a4c1282..504401ea0196 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4131,7 +4131,7 @@ self: super: with self; {
 
   gpgme = toPythonModule (pkgs.gpgme.override {
     pythonSupport = true;
-    inherit python;
+    python3 = python;
   });
 
   gphoto2 = callPackage ../development/python-modules/gphoto2 { };