Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gpgme: fix cross, drop python2 #226123

Merged
merged 1 commit into from Apr 15, 2023
Merged

gpgme: fix cross, drop python2 #226123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions pkgs/development/libraries/gpgme/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
, qtbase ? null
, pythonSupport ? false
, swig2 ? null
, python ? null
# only for passthru.tests
, libsForQt5
, python3
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };
Expand Down