Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

neargye-semver: init at 0.3.1 #393018

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 66 additions & 0 deletions pkgs/by-name/ne/neargye-semver/001-remove-hunter.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6be6e8..65b9f53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,12 +4,12 @@

cmake_minimum_required(VERSION 3.2)

-include("cmake/HunterGate.cmake")
-HunterGate(
- URL "https://github.com/cpp-pm/hunter/archive/9d9242b60d5236269f894efd3ddd60a9ca83dd7f.tar.gz"
- SHA1 "16cc954aa723bccd16ea45fc91a858d0c5246376"
- LOCAL # Local config for dependencies
-)
+# include("cmake/HunterGate.cmake")
+# HunterGate(
+# URL "https://github.com/cpp-pm/hunter/archive/9d9242b60d5236269f894efd3ddd60a9ca83dd7f.tar.gz"
+# SHA1 "16cc954aa723bccd16ea45fc91a858d0c5246376"
+# LOCAL # Local config for dependencies
+# )

### Constants
set(TARGET_NAME "XLink")
@@ -253,12 +253,12 @@ install(
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/XLink
)

-# Install Hunter dependencies
-if(XLINK_ENABLE_LIBUSB)
- if(NOT XLINK_LIBUSB_LOCAL AND NOT XLINK_LIBUSB_SYSTEM)
- install(DIRECTORY "${HUNTER_INSTALL_PREFIX}/" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/dependencies")
- endif()
-endif()
+# # Install Hunter dependencies
+# if(XLINK_ENABLE_LIBUSB)
+# if(NOT XLINK_LIBUSB_LOCAL AND NOT XLINK_LIBUSB_SYSTEM)
+# install(DIRECTORY "${HUNTER_INSTALL_PREFIX}/" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/dependencies")
+# endif()
+# endif()
# Install export group (information about targets)
install(EXPORT ${PROJECT_EXPORT_GROUP}
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
diff --git a/cmake/XLinkDependencies.cmake b/cmake/XLinkDependencies.cmake
index 1072d1d..30d63bf 100644
--- a/cmake/XLinkDependencies.cmake
+++ b/cmake/XLinkDependencies.cmake
@@ -9,7 +9,8 @@ else()
# set(XLINK_SHARED_LIBS ${BUILD_SHARED_LIBS})
if(XLINK_ENABLE_LIBUSB)
if(NOT XLINK_LIBUSB_LOCAL AND NOT XLINK_LIBUSB_SYSTEM)
- hunter_add_package(libusb-luxonis)
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(libusb REQUIRED libusb-1.0)
endif()
endif()
endif()
@@ -19,7 +20,8 @@ if(XLINK_ENABLE_LIBUSB)
if(XLINK_LIBUSB_LOCAL)
add_subdirectory("${XLINK_LIBUSB_LOCAL}" "${CMAKE_CURRENT_BINARY_DIR}/libusb" EXCLUDE_FROM_ALL)
elseif(NOT XLINK_LIBUSB_SYSTEM)
- find_package(usb-1.0 ${_QUIET} CONFIG REQUIRED HINTS "${CMAKE_CURRENT_LIST_DIR}/libusb")
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(libusb REQUIRED libusb-1.0)
endif()
endif()

66 changes: 66 additions & 0 deletions pkgs/by-name/ne/neargye-semver/002-remove-hunter.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3161667..24419d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,12 +4,12 @@

cmake_minimum_required(VERSION 3.2)

-include("cmake/HunterGate.cmake")
-HunterGate(
- URL "https://github.com/cpp-pm/hunter/archive/v0.23.320.tar.gz"
- SHA1 "9b4e732afd22f40482c11ad6342f7d336634226f"
- LOCAL # Local config for dependencies
-)
+# include("cmake/HunterGate.cmake")
+# HunterGate(
+# URL "https://github.com/cpp-pm/hunter/archive/v0.23.320.tar.gz"
+# SHA1 "9b4e732afd22f40482c11ad6342f7d336634226f"
+# LOCAL # Local config for dependencies
+# )

### Constants
set(TARGET_NAME "XLink")
@@ -233,12 +233,12 @@ install(
)
#Install include folder
install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-# Install Hunter dependencies
-if(XLINK_ENABLE_LIBUSB)
- if(NOT XLINK_LIBUSB_LOCAL AND NOT XLINK_LIBUSB_SYSTEM)
- install(DIRECTORY "${HUNTER_INSTALL_PREFIX}/" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/dependencies")
- endif()
-endif()
+# # Install Hunter dependencies
+# if(XLINK_ENABLE_LIBUSB)
+# if(NOT XLINK_LIBUSB_LOCAL AND NOT XLINK_LIBUSB_SYSTEM)
+# install(DIRECTORY "${HUNTER_INSTALL_PREFIX}/" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/dependencies")
+# endif()
+# endif()
# Install export group (information about targets)
install(EXPORT ${PROJECT_EXPORT_GROUP}
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
diff --git a/cmake/XLinkDependencies.cmake b/cmake/XLinkDependencies.cmake
index 1072d1d..a213bee 100644
--- a/cmake/XLinkDependencies.cmake
+++ b/cmake/XLinkDependencies.cmake
@@ -9,7 +9,8 @@ else()
# set(XLINK_SHARED_LIBS ${BUILD_SHARED_LIBS})
if(XLINK_ENABLE_LIBUSB)
if(NOT XLINK_LIBUSB_LOCAL AND NOT XLINK_LIBUSB_SYSTEM)
- hunter_add_package(libusb-luxonis)
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(libusb REQUIRED libusb-1.0)
endif()
endif()
endif()
@@ -19,7 +20,8 @@ if(XLINK_ENABLE_LIBUSB)
if(XLINK_LIBUSB_LOCAL)
add_subdirectory("${XLINK_LIBUSB_LOCAL}" "${CMAKE_CURRENT_BINARY_DIR}/libusb" EXCLUDE_FROM_ALL)
elseif(NOT XLINK_LIBUSB_SYSTEM)
- find_package(usb-1.0 ${_QUIET} CONFIG REQUIRED HINTS "${CMAKE_CURRENT_LIST_DIR}/libusb")
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(libusb REQUIRED libusb-1.0)
endif()
endif()

42 changes: 42 additions & 0 deletions pkgs/by-name/ne/neargye-semver/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
pkg-config,
}:

stdenv.mkDerivation (finalAttrs: {
pname = "neargye-semver";
version = "0.3.1";

src = fetchFromGitHub {
owner = "Neargye";
repo = "semver";
tag = "v${finalAttrs.version}";
sha256 = "sha256-0HOp+xzo8xcCUUgtSh87N9DXP5P0odBaYXhcDzOiiXE=";
};

nativeBuildInputs = [
cmake
pkg-config
];

buildInputs = [ ];

cmakeFlags = [ (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") ];

# Install headers
postInstall = ''
mkdir -p $out/include
cp -r $src/include/* $out/include/
'';

meta = {
description = "C++17 header-only dependency-free versioning library complying with Semantic Versioning 2.0.0";
homepage = "https://github.com/Neargye/semver";
license = lib.licenses.mit;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ phodina ];
};
})