Unverified Commit e0be264b authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

libevdevplus, libuinputplus: drop (#457965)

parents 127b6a6b 45bcb14f
Loading
Loading
Loading
Loading
+0 −41
Original line number Diff line number Diff line
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
+0 −36
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  fetchFromGitHub,
  cmake,
  pkg-config,
}:

stdenv.mkDerivation rec {
  pname = "libevdevplus";
  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 {
    owner = "YukiWorkshop";
    repo = "libevdevPlus";
    rev = "b4d4b3143056424a3da9f0516ca02a47209ef757";
    sha256 = "09y65s16gch0w7fy1s9yjk9gz3bjzxix36h5wmwww6lkj2i1z3rj";
  };

  nativeBuildInputs = [
    cmake
    pkg-config
  ];

  meta = with lib; {
    inherit (src.meta) homepage;
    description = "Easy-to-use event device library in C++";
    license = licenses.mit;
    maintainers = [ ];
    platforms = with platforms; linux;
  };
}
+0 −40
Original line number Diff line number Diff line
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
+0 −40
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  fetchFromGitHub,
  cmake,
  pkg-config,
}:
stdenv.mkDerivation rec {
  pname = "libuinputplus";
  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 = "f7f18eb339bba61a43f2cad481a9b1a453a66957";
    sha256 = "0sind2ghhy4h9kfkr5hsmhcq0di4ifwqyv4gac96rgj5mwvs33lp";
  };

  nativeBuildInputs = [
    cmake
    pkg-config
  ];

  postPatch = ''
    substituteInPlace CMakeLists.txt \
      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
  '';

  meta = with lib; {
    inherit (src.meta) homepage;
    description = "Easy-to-use uinput library in C++";
    license = licenses.mit;
    maintainers = [ ];
    platforms = with platforms; linux;
  };
}
+2 −0
Original line number Diff line number Diff line
@@ -793,6 +793,7 @@ mapAliases {
  libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
  libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
  libdwarf-lite = throw "`libdwarf-lite` has been replaced by `libdwarf` as it's mostly a mirror"; # Added 2025-06-16
  libevdevplus = throw "'libevdevplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02
  libfprint-focaltech-2808-a658 = throw "'libfprint-focaltech-2808-a658' has been removed as it was broken and upstream was taken down"; # Added 2025-11-04
  libfpx = throw "libfpx has been removed as it was unmaintained in Nixpkgs and had known vulnerabilities"; # Added 2025-05-20
  libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17
@@ -833,6 +834,7 @@ mapAliases {
  libtorrent = throw "'libtorrent' has been renamed to 'libtorrent-rakshasa' for clearer distinction from 'libtorrent-rasterbar'"; # Added 2025-09-10
  libtransmission = throw "libtransmission_3 has been removed in favour of libtransmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26
  libtransmission_3 = throw "libtransmission_3 has been removed in favour of libtransmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26
  libuinputplus = throw "'libuinputplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02
  libviper = throw "'libviper' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
  libwnck3 = throw "'libwnck3' has been renamed to/replaced by 'libwnck'"; # Converted to throw 2025-10-27
  lightdm_gtk_greeter = throw "'lightdm_gtk_greeter' has been renamed to/replaced by 'lightdm-gtk-greeter'"; # Converted to throw 2025-10-27