Unverified Commit 3e1f1bea authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

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

parents 3a6a3f6f 4cfab1b3

pkgs/development/libraries/pdal/default.nix

+7 −1
Original line number Diff line number Diff line
@@ -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; {

pkgs/development/libraries/pdal/pdal.pc.in.patch

0 → 100644
+12 −0
Original line number Diff line number Diff line 
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