diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 8e7d10782157..44086538cd04 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan -, file, which +, file, which, ncurses , autoreconfHook , git , texinfo , qtbase ? null -, withPython ? false, swig2 ? null, python ? null +, pythonSupport ? false, swig2 ? null, python ? null }: let @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ++ lib.optional (qtbase != null) qtbase; nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ] - ++ lib.optionals withPython [ python swig2 which ]; + ++ lib.optionals pythonSupport [ python swig2 which ncurses ]; postPatch ='' substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-fixed-path=${gnupg}/bin" "--with-libgpg-error-prefix=${libgpgerror.dev}" - ] ++ lib.optional withPython "--enable-languages=python"; + ] ++ lib.optional pythonSupport "--enable-languages=python"; NIX_CFLAGS_COMPILE = # qgpgme uses Q_ASSERT which retains build inputs at runtime unless diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f2c0c7c1b27a..3ec5d7f9e9a8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5672,7 +5672,7 @@ in { google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { }; - gpgme = toPythonModule (pkgs.gpgme.override { withPython=true; }); + gpgme = toPythonModule (pkgs.gpgme.override { pythonSupport=true; inherit python; }); gphoto2 = callPackage ../development/python-modules/gphoto2 { inherit (pkgs) pkgconfig;