summary refs log tree commit diff
diff options
context:
space:
mode:
authorJappie Klooster <jappieklooster@hotmail.com>2021-04-02 16:41:43 -0400
committerJappie Klooster <jappieklooster@hotmail.com>2021-04-03 11:02:14 -0400
commit584490f6809daa3d68c7200e95d9ebf714d60e0a (patch)
treea7e550f0e867da21a8d55a3f529f4a773de50791
parentc4606d16d4c893c8173016df7d1195207cedd877 (diff)
downloadnixpkgs-584490f6809daa3d68c7200e95d9ebf714d60e0a.tar
nixpkgs-584490f6809daa3d68c7200e95d9ebf714d60e0a.tar.gz
nixpkgs-584490f6809daa3d68c7200e95d9ebf714d60e0a.tar.bz2
nixpkgs-584490f6809daa3d68c7200e95d9ebf714d60e0a.tar.lz
nixpkgs-584490f6809daa3d68c7200e95d9ebf714d60e0a.tar.xz
nixpkgs-584490f6809daa3d68c7200e95d9ebf714d60e0a.tar.zst
nixpkgs-584490f6809daa3d68c7200e95d9ebf714d60e0a.zip
libinputplus: 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.

fix spelling of Tomporarly

readd rec block to libuintput

Add patch for missing cmake directives
-rw-r--r--pkgs/development/libraries/libuinputplus/0001-Add-cmake-install-directives.patch40
-rw-r--r--pkgs/development/libraries/libuinputplus/default.nix11
2 files changed, 47 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libuinputplus/0001-Add-cmake-install-directives.patch b/pkgs/development/libraries/libuinputplus/0001-Add-cmake-install-directives.patch
new file mode 100644
index 00000000000..cd6f43d3770
--- /dev/null
+++ b/pkgs/development/libraries/libuinputplus/0001-Add-cmake-install-directives.patch
@@ -0,0 +1,40 @@
+From 265e406e254c8d84016b12b344d8df71d1765dd1 Mon Sep 17 00:00:00 2001
+From: Jappie Klooster <jappieklooster@hotmail.com>
+Date: Fri, 2 Apr 2021 16:33:18 -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 consider adding them.
+---
+ CMakeLists.txt | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cbfc9c1..948c432 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,6 +7,8 @@ set(SOURCE_FILES
+         uInput.cpp uInputSetup.cpp uInputResource.cpp
+         uInput.hpp CommonIncludes.hpp uInputSetup.hpp)
+ 
++include(GNUInstallDirs)
++
+ add_library(uInputPlus ${SOURCE_FILES})
+ target_include_directories(uInputPlus PUBLIC .)
+ 
+@@ -15,3 +17,9 @@ target_link_libraries(uInputPlus_test uInputPlus)
+ 
+ configure_file(uInputPlus.pc.in uInputPlus.pc @ONLY)
+ 
++
++install(TARGETS uInputPlus
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(FILES uInput.hpp CommonIncludes.hpp uInputSetup.hpp
++        DESTINATION include/)
++
+-- 
+2.29.2
+
diff --git a/pkgs/development/libraries/libuinputplus/default.nix b/pkgs/development/libraries/libuinputplus/default.nix
index 9085b861078..28110b57704 100644
--- a/pkgs/development/libraries/libuinputplus/default.nix
+++ b/pkgs/development/libraries/libuinputplus/default.nix
@@ -1,14 +1,17 @@
 { lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
-
 stdenv.mkDerivation rec {
   pname = "libuinputplus";
-  version = "2019-10-01";
+  version = "2021-04-02";
+
+  # adds missing cmake install directives
+  # https://github.com/YukiWorkshop/libuInputPlus/pull/7
+  patches = [ ./0001-Add-cmake-install-directives.patch];
 
   src  = fetchFromGitHub {
     owner  = "YukiWorkshop";
     repo   = "libuInputPlus";
-    rev    = "962f180b4cc670e1f5cc73c2e4d5d196ae52d630";
-    sha256 = "0jy5i7bmjad7hw1qcyjl4swqribp2027s9g3609zwj7lj8z5x0bg";
+    rev    = "f7f18eb339bba61a43f2cad481a9b1a453a66957";
+    sha256 = "0sind2ghhy4h9kfkr5hsmhcq0di4ifwqyv4gac96rgj5mwvs33lp";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];