Merge pull request #226123 from amjoseph-nixpkgs/pr/fixcross/gpgme

gpgme: fix cross, drop python2
This commit is contained in:
Robert Schütz 2023-04-14 18:06:58 -07:00 committed by GitHub
commit b564f8038d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions

View file

@ -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

View file

@ -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 { };