libevdevplus: 2019-10-01 -> 2021-04-02
This upgrade is made intandum with upgrading ydotools. ydotools is the only dependending package of this library at the moment. add coment in libevdeplus on repo change libevdevplus: Add patch missing cmake directives
This commit is contained in:
parent
c102db25e8
commit
c4606d16d4
|
@ -0,0 +1,41 @@
|
||||||
|
From 7f208aaf21aa468013fc41e67c32f6a6c8c08249 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jappie Klooster <jappieklooster@hotmail.com>
|
||||||
|
Date: Fri, 2 Apr 2021 16:01:05 -0400
|
||||||
|
Subject: [PATCH] Add cmake install directives
|
||||||
|
|
||||||
|
To make nix builds work, it expect a make install command to
|
||||||
|
be available.
|
||||||
|
Adding these directives seems to fix the build.
|
||||||
|
|
||||||
|
If it's no trouble to you, please add them.
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 9 ++++++++-
|
||||||
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index f9db618..425d391 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -4,10 +4,17 @@ project(libevdevPlus)
|
||||||
|
set(SOURCE_FILES
|
||||||
|
evdevPlus.cpp evdevPlus.hpp CommonIncludes.hpp InputEvent.hpp Resource.cpp)
|
||||||
|
|
||||||
|
+include(GNUInstallDirs)
|
||||||
|
+
|
||||||
|
add_library(evdevPlus ${SOURCE_FILES})
|
||||||
|
target_include_directories(evdevPlus PUBLIC .)
|
||||||
|
|
||||||
|
add_executable(evdevPlus_test test.cpp)
|
||||||
|
target_link_libraries(evdevPlus_test evdevPlus)
|
||||||
|
|
||||||
|
-configure_file(evdevPlus.pc.in evdevPlus.pc @ONLY)
|
||||||
|
\ No newline at end of file
|
||||||
|
+configure_file(evdevPlus.pc.in evdevPlus.pc @ONLY)
|
||||||
|
+
|
||||||
|
+install(TARGETS evdevPlus
|
||||||
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||||
|
+install(FILES evdevPlus.hpp CommonIncludes.hpp InputEvent.hpp
|
||||||
|
+ DESTINATION include/)
|
||||||
|
--
|
||||||
|
2.29.2
|
||||||
|
|
|
@ -2,13 +2,17 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libevdevplus";
|
pname = "libevdevplus";
|
||||||
version = "unstable-2019-10-01";
|
version = "unstable-2021-04-02";
|
||||||
|
|
||||||
|
# adds missing cmake install directives
|
||||||
|
# https://github.com/YukiWorkshop/libevdevPlus/pull/10
|
||||||
|
patches = [ ./0001-Add-cmake-install-directives.patch];
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "YukiWorkshop";
|
owner = "YukiWorkshop";
|
||||||
repo = "libevdevPlus";
|
repo = "libevdevPlus";
|
||||||
rev = "e863df2ade43e2c7d7748cc33ca27fb3eed325ca";
|
rev = "b4d4b3143056424a3da9f0516ca02a47209ef757";
|
||||||
sha256 = "18z6pn4j7fhmwwh0q22ip5nn7sc1hfgwvkdzqhkja60i8cw2cvvj";
|
sha256 = "09y65s16gch0w7fy1s9yjk9gz3bjzxix36h5wmwww6lkj2i1z3rj";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
|
|
Loading…
Reference in New Issue