nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-09 05:33:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #331092 from imincik/pdal-fix-pkgconfig-file

Browse Source
This commit is contained in:
Sandro 2024-07-31 13:24:38 +02:00 committed by GitHub
commit 3e1f1beac4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/pdal/default.nix
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; {

12
pkgs/development/libraries/pdal/pdal.pc.in.patch Normal file
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