diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-04-14 00:08:27 -0700 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-04-14 11:25:26 -0700 |
| commit | 08c78eaa64c0761ed7778fc5b10799c395efe7aa (patch) | |
| tree | a415f17ac8ded06ba52fa72bdba8f91233cbf390 | |
| parent | e461b078619466c1e61223ab750065a0ea30085d (diff) | |
| download | nixpkgs-08c78eaa64c0761ed7778fc5b10799c395efe7aa.tar nixpkgs-08c78eaa64c0761ed7778fc5b10799c395efe7aa.tar.gz nixpkgs-08c78eaa64c0761ed7778fc5b10799c395efe7aa.tar.bz2 nixpkgs-08c78eaa64c0761ed7778fc5b10799c395efe7aa.tar.lz nixpkgs-08c78eaa64c0761ed7778fc5b10799c395efe7aa.tar.xz nixpkgs-08c78eaa64c0761ed7778fc5b10799c395efe7aa.tar.zst nixpkgs-08c78eaa64c0761ed7778fc5b10799c395efe7aa.zip | |
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.
| -rw-r--r-- | pkgs/development/libraries/gpgme/default.nix | 7 | ||||
| -rw-r--r-- | 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 2079123ed1a..a2b7daa28de 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 acf33a4c128..504401ea019 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 { }; |