JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python3Packages.gpgme: enable python3 version

Browse Source 
when calling python3Packages.gpgme, it was still picking python2.
Changed withPython into pythonSupport since it's the convention.

I had to enable ncurses too because of this error when configuring:

configure:19978: checking python extra libraries
configure:19985: result: -lpthread -ldl -lcrypt -lncurses -lutil -lm
configure:19992: checking python extra linking flags
configure:19999: result: -Xlinker -export-dynamic
configure:20006: checking consistency of all components of python development environment
configure:20032: gcc -o conftest -g -O2  -I/nix/store/hy65mn4wjswqih75gfr6g4q3xgqdm325-python3-3.6.6/include/python3.6m  conftest.c  -L/nix/store/hy65mn4wjswqih75gfr6g4q3xgqdm325-python3-3.6.6/lib -lpython3.6m -Xlinker -export-dynamic -lpthread -ldl -lcrypt -lncurses -lutil -lm >&5
/nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/ld: cannot find -lncurses
collect2: error: ld returned 1 exit status
configure:20032: $? = 1
This commit is contained in:
Matthieu Coudron 2018-09-07 17:58:11 +09:00
parent 9a3e418664
commit 3902b3f4e7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/gpgme/default.nix
View File

@ -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

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

@ -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;