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

Merge pull request #46304 from teto/gpgme_python3

Browse Source 
python3Packages.gpgme: enable python3 support
This commit is contained in:
Michael Weiss 2018-10-19 22:17:19 +02:00 committed by GitHub
commit 02b5f4ff79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 { stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
, file, which , file, which, ncurses
, autoreconfHook , autoreconfHook
, git , git
, texinfo , texinfo
, qtbase ? null , qtbase ? null
, withPython ? false, swig2 ? null, python ? null , pythonSupport ? false, swig2 ? null, python ? null
}: }:
let let
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
++ lib.optional (qtbase != null) qtbase; ++ lib.optional (qtbase != null) qtbase;
nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ] nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ]
++ lib.optionals withPython [ python swig2 which ]; ++ lib.optionals pythonSupport [ python swig2 which ncurses ];
postPatch ='' postPatch =''
substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--enable-fixed-path=${gnupg}/bin" "--enable-fixed-path=${gnupg}/bin"
"--with-libgpg-error-prefix=${libgpgerror.dev}" "--with-libgpg-error-prefix=${libgpgerror.dev}"
] ++ lib.optional withPython "--enable-languages=python"; ] ++ lib.optional pythonSupport "--enable-languages=python";
NIX_CFLAGS_COMPILE = NIX_CFLAGS_COMPILE =
# qgpgme uses Q_ASSERT which retains build inputs at runtime unless # qgpgme uses Q_ASSERT which retains build inputs at runtime unless

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

@ -5656,7 +5656,7 @@ in {
google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { }; 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 { gphoto2 = callPackage ../development/python-modules/gphoto2 {
inherit (pkgs) pkgconfig; inherit (pkgs) pkgconfig;