Merge pull request #194930 from bachp/cyclondds

From 4534f88f676d9a07a227aed7b56255dd84d2b906 Mon Sep 17 00:00:00 2001

From: Pascal Bach <pascal.bach@nextrem.ch>

Date: Mon, 3 Oct 2022 22:57:34 +0200

Subject: [PATCH] Use full path in pkgconfig

Signed-off-by: Pascal Bach <pascal.bach@nextrem.ch>

---

 PkgConfig.pc.in | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PkgConfig.pc.in b/PkgConfig.pc.in

index 381e2343..93860ff0 100644

--- a/PkgConfig.pc.in

+++ b/PkgConfig.pc.in

@@ -1,6 +1,6 @@

 prefix=@CMAKE_INSTALL_PREFIX@

-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@

-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@

+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@

+libdir=@CMAKE_INSTALL_FULL_LIBDIR@

 Name: @PROJECT_NAME@

 Description: Eclipse Cyclone DDS library

-- 

2.37.3

{ lib

, stdenv

, fetchFromGitHub

, cmake

}:

stdenv.mkDerivation rec {

  pname = "cyclondds";

  version = "0.10.2";

  src = fetchFromGitHub {

    owner = "eclipse-cyclonedds";

    repo = "cyclonedds";

    rev = version;

    sha256 = "sha256-xr9H9n+gyFMgEMHn59T6ELYVZJ1m8laG0d99SE9k268=";

  };

  patches = [

    ./0001-Use-full-path-in-pkgconfig.patch

  ];

  nativeBuildInputs = [ cmake ];

  meta = with lib; {

    description = "Eclipse Cyclone DDS project";

    homepage = "https://cyclonedds.io/";

    license = with licenses; [ epl20 ];

    maintainers = with maintainers; [ bachp ];

  };

}

  cuelsp = callPackage ../development/tools/cuelsp {};

  cyclondds = callPackage ../development/libraries/cyclondds { };

  cyclone-scheme = callPackage ../development/interpreters/cyclone { };

  cyclonedx-gomod = callPackage ../tools/security/cyclonedx-gomod { };