cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/libraries/gpgme/default.nix
View file

@ -17,7 +17,6 @@
, qtbase ? null , qtbase ? null
, pythonSupport ? false , pythonSupport ? false
, swig2 ? null , swig2 ? null
, python ? null
# only for passthru.tests # only for passthru.tests
, libsForQt5 , libsForQt5
, python3 , python3
@ -51,12 +50,16 @@ stdenv.mkDerivation rec {
pkg-config pkg-config
texinfo texinfo
] ++ lib.optionals pythonSupport [ ] ++ lib.optionals pythonSupport [
python3.pythonForBuild
ncurses ncurses
python
swig2 swig2
which which
]; ];
buildInputs = lib.optionals pythonSupport [
python3
];
propagatedBuildInputs = [ propagatedBuildInputs = [
glib glib
libassuan libassuan

2
pkgs/top-level/python-packages.nix
View file

@ -4131,7 +4131,7 @@ self: super: with self; {
gpgme = toPythonModule (pkgs.gpgme.override { gpgme = toPythonModule (pkgs.gpgme.override {
pythonSupport = true; pythonSupport = true;
inherit python; python3 = python;
}); });
gphoto2 = callPackage ../development/python-modules/gphoto2 { }; gphoto2 = callPackage ../development/python-modules/gphoto2 { };