MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

gpgme: enable Qt 5 bindings

Browse source
This commit is contained in:
Jos van den Oever 2017-04-06 22:35:12 +02:00 committed by Thomas Tuegel
parent 30ff56a20f
commit 05ef92e53a
No known key found for this signature in database
GPG key ID: 22CBF5249D4B4D59
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/gpgme/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan }:
{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan, qt5 }:
stdenv.mkDerivation rec {
name = "gpgme-1.9.0";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "info" ];
outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool
propagatedBuildInputs = [ libgpgerror glib libassuan pth ];
propagatedBuildInputs = [ libgpgerror glib libassuan pth qt5.qtbase ];
nativeBuildInputs = [ pkgconfig gnupg ];
@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
"--enable-fixed-path=${gnupg}/bin"
];
patches = [ ./gpgme_libsuffix.patch ];
# https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html
NIX_CFLAGS_COMPILE =
with stdenv; lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64";

12
pkgs/development/libraries/gpgme/gpgme_libsuffix.patch Normal file
View file

@ -0,0 +1,12 @@
diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
index 928d19f..cbe9713 100644 (file)
--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
+++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in
@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED)
set_target_properties(Gpgmepp PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
- INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
+ INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@"
IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so"
)