Merge pull request #194930 from bachp/cyclondds

cyclondds: init at 0.10.2
This commit is contained in:
Nikolay Korotkiy 2023-02-19 00:48:44 +04:00 committed by GitHub
commit ad5374c68e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 58 additions and 0 deletions

View file

@ -0,0 +1,26 @@
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

View file

@ -0,0 +1,30 @@
{ 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 ];
};
}

View file

@ -3095,6 +3095,8 @@ with pkgs;
cuelsp = callPackage ../development/tools/cuelsp {};
cyclondds = callPackage ../development/libraries/cyclondds { };
cyclone-scheme = callPackage ../development/interpreters/cyclone { };
cyclonedx-gomod = callPackage ../tools/security/cyclonedx-gomod { };