From 4cfab1b3d69cb66acc1e326e52a1f30ca41dcd82 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Tue, 30 Jul 2024 16:36:19 +0200 Subject: [PATCH] pdal: fix libdir path in pkgconfig file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Johannes Jöns <34899572+jopejoe1@users.noreply.github.com> --- pkgs/development/libraries/pdal/default.nix | 8 +++++++- pkgs/development/libraries/pdal/pdal.pc.in.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/pdal/pdal.pc.in.patch diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index a6a594883712..c85459c244c9 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -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; { diff --git a/pkgs/development/libraries/pdal/pdal.pc.in.patch b/pkgs/development/libraries/pdal/pdal.pc.in.patch new file mode 100644 index 000000000000..1d981c0f6a97 --- /dev/null +++ b/pkgs/development/libraries/pdal/pdal.pc.in.patch @@ -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