pdal: fix libdir path in pkgconfig file

Co-authored-by: Johannes Jöns <34899572+jopejoe1@users.noreply.github.com>
This commit is contained in:
Ivan Mincik 2024-07-30 16:36:19 +02:00
parent 5d9f1a8d79
commit 4cfab1b3d6
2 changed files with 19 additions and 1 deletions

View File

@ -37,6 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-ukBZLr/iyYQ68sv9JWrR4YP0ahHfGhytgcWKPzrF3Ps=";
};
patches = [
./pdal.pc.in.patch
];
nativeBuildInputs = [
cmake
pkg-config
@ -124,7 +128,9 @@ stdenv.mkDerivation (finalAttrs: {
version = "pdal ${finalAttrs.finalPackage.version}";
};
pdal = callPackage ./tests.nix { pdal = finalAttrs.finalPackage; };
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
pkg-config = testers.hasPkgConfigModules {
package = finalAttrs.finalPackage;
};
};
meta = with lib; {

View File

@ -0,0 +1,12 @@
diff --git a/apps/pdal.pc.in b/apps/pdal.pc.in
index 6885221cacc8..a07ee82cea68 100644
--- a/apps/pdal.pc.in
+++ b/apps/pdal.pc.in
@@ -1,6 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
includedir=@CMAKE_INSTALL_PREFIX@/include
Name: PDAL