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.
This commit is contained in:
parent
e461b07861
commit
08c78eaa64
|
@ -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
|
||||||
|
|
|
@ -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 { };
|
||||||
|
|
Loading…
Reference in a new issue