From 3e2fee2a5ef9be617972bb3a2c6bed0a52dae5c7 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Mon, 22 Dec 2025 16:47:38 +0100 Subject: [PATCH] gpgmepp: fix includedir path in the exported CMake target Signed-off-by: Marcin Serwin --- ...Don-t-hardcode-include-as-includedir.patch | 39 +++++++++++++++++++ pkgs/by-name/gp/gpgmepp/package.nix | 5 ++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/gp/gpgmepp/0001-Don-t-hardcode-include-as-includedir.patch diff --git a/pkgs/by-name/gp/gpgmepp/0001-Don-t-hardcode-include-as-includedir.patch b/pkgs/by-name/gp/gpgmepp/0001-Don-t-hardcode-include-as-includedir.patch new file mode 100644 index 000000000000..3109da1af152 --- /dev/null +++ b/pkgs/by-name/gp/gpgmepp/0001-Don-t-hardcode-include-as-includedir.patch @@ -0,0 +1,39 @@ +From b56db4b30ec696b018c04400440d0252af13990a Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Mon, 22 Dec 2025 16:44:46 +0100 +Subject: [PATCH] Don't hardcode 'include' as includedir + +The headers are installed into the location pointed by +CMAKE_INSTALL_INCLUDEDIR so if it's different than the default 'include' +then the header path in the exported CMake targets is incorrect. + +Signed-off-by: Marcin Serwin +--- + src/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7be46cb..97d21b1 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -128,7 +128,7 @@ if(ENABLE_SHARED) + + target_include_directories(Gpgmepp + PRIVATE ${LibGpgError_INCLUDE_DIRS} +- INTERFACE $ ++ INTERFACE $ + ) + + target_link_libraries(Gpgmepp Gpgme::Gpgme) +@@ -144,7 +144,7 @@ if(ENABLE_STATIC) + + target_include_directories(GpgmeppStatic + PRIVATE ${LibGpgError_INCLUDE_DIRS} +- INTERFACE $ ++ INTERFACE $ + ) + + target_link_libraries(GpgmeppStatic Gpgme::Gpgme) +-- +2.51.2 + diff --git a/pkgs/by-name/gp/gpgmepp/package.nix b/pkgs/by-name/gp/gpgmepp/package.nix index b595fecb593f..c802a7a3a015 100644 --- a/pkgs/by-name/gp/gpgmepp/package.nix +++ b/pkgs/by-name/gp/gpgmepp/package.nix @@ -16,7 +16,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-1HlgScBnCKJvMJb3SO8JU0fho8HlcFYXAf6VLD9WU4I="; }; - patches = [ ./0001-Fix-handling-of-absolute-install-dirs-in-.pc-install.patch ]; + patches = [ + ./0001-Fix-handling-of-absolute-install-dirs-in-.pc-install.patch + ./0001-Don-t-hardcode-include-as-includedir.patch + ]; nativeBuildInputs = [ cmake