logiops: 0.2.3 -> 0.3.3

feat: Add multiple version support.

refactor: Remove unnecessary code.

The `DBus` handling is already done via the changed patch file.

chore: Fix formatting.

refactor: Remove confusing comment.

refactor: Abide by `by-name` CI.

https://github.com/NixOS/nixpkgs/actions/runs/7968015723/job/21751618054?pr=289701

fix: Remove unnecessary CMake build flag.

Nixpkgs already always builds Release, so this is redundant.

+86 -2
+56
pkgs/by-name/lo/logiops/package.nix
···
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchFromGitHub, 5 + pkg-config, 6 + cmake, 7 + glib, 8 + udev, 9 + libevdev, 10 + libconfig, 11 + }: 12 + 13 + stdenv.mkDerivation (oldAttrs: { 14 + pname = "logiops"; 15 + version = "0.3.3"; 16 + 17 + src = fetchFromGitHub { 18 + owner = "PixlOne"; 19 + repo = "logiops"; 20 + rev = "v${oldAttrs.version}"; 21 + sha256 = "sha256-9nFTud5szQN8jpG0e/Bkp+I9ELldfo66SdfVCUTuekg="; 22 + # In v0.3.0, the `ipcgull` submodule was added as a dependency 23 + # https://github.com/PixlOne/logiops/releases/tag/v0.3.0 24 + fetchSubmodules = true; 25 + }; 26 + 27 + patches = [ 28 + ./pkgs0001-Make-DBUS_SYSTEM_POLICY_INSTALL_DIR-externally-overr.patch 29 + ]; 30 + 31 + nativeBuildInputs = [ 32 + cmake 33 + pkg-config 34 + ]; 35 + buildInputs = [ 36 + udev 37 + libevdev 38 + libconfig 39 + glib 40 + ]; 41 + 42 + cmakeFlags = [ 43 + "-DLOGIOPS_VERSION=${oldAttrs.version}" 44 + "-DDBUS_SYSTEM_POLICY_INSTALL_DIR=${placeholder "out"}/share/dbus-1/system.d" 45 + ]; 46 + 47 + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; 48 + 49 + meta = with lib; { 50 + description = "Unofficial userspace driver for HID++ Logitech devices"; 51 + homepage = "https://github.com/PixlOne/logiops"; 52 + license = licenses.gpl3Plus; 53 + maintainers = with maintainers; [ ckie ]; 54 + platforms = with platforms; linux; 55 + }; 56 + })
+30
pkgs/by-name/lo/logiops/pkgs0001-Make-DBUS_SYSTEM_POLICY_INSTALL_DIR-externally-overr.patch
···
··· 1 + From b7588376e20661c8d79e7472732244c70b8e7d3f Mon Sep 17 00:00:00 2001 2 + From: ckie <git-525ff67@ckie.dev> 3 + Date: Mon, 16 Oct 2023 02:02:38 +0300 4 + Subject: [PATCH] Make DBUS_SYSTEM_POLICY_INSTALL_DIR externally overrideable 5 + 6 + --- 7 + src/logid/CMakeLists.txt | 6 ++++-- 8 + 1 file changed, 4 insertions(+), 2 deletions(-) 9 + 10 + diff --git a/src/logid/CMakeLists.txt b/src/logid/CMakeLists.txt 11 + index b2616c8..58d6719 100644 12 + --- a/src/logid/CMakeLists.txt 13 + +++ b/src/logid/CMakeLists.txt 14 + @@ -111,9 +111,11 @@ elseif (NOT SYSTEMD_FOUND AND SYSTEMD_SERVICES_INSTALL_DIR) 15 + endif () 16 + 17 + # Install DBus conf 18 + -# TODO: Is there a better way of setting the system policy directory? 19 + -set(DBUS_SYSTEM_POLICY_INSTALL_DIR "/usr/share/dbus-1/system.d") 20 + configure_file(logiops-dbus.conf.in ${CMAKE_BINARY_DIR}/pizza.pixl.LogiOps.conf) 21 + +if (NOT DEFINED DBUS_SYSTEM_POLICY_INSTALL_DIR) 22 + + # TODO: Is there a better way of setting the system policy directory? 23 + + set(DBUS_SYSTEM_POLICY_INSTALL_DIR "/usr/share/dbus-1/system.d") 24 + +endif () 25 + message(STATUS "dbus system policy will be installed at ${DBUS_SYSTEM_POLICY_INSTALL_DIR}") 26 + install(FILES ${CMAKE_BINARY_DIR}/pizza.pixl.LogiOps.conf 27 + DESTINATION ${DBUS_SYSTEM_POLICY_INSTALL_DIR} 28 + -- 29 + 2.42.0 30 +
pkgs/misc/drivers/logiops/default.nix pkgs/by-name/lo/logiops_0_2_3/package.nix
-2
pkgs/top-level/all-packages.nix
··· 29407 29408 lmodern = callPackage ../data/fonts/lmodern { }; 29409 29410 - logiops = callPackage ../misc/drivers/logiops { }; 29411 - 29412 # ltunifi and solaar both provide udev rules but solaar's rules are more 29413 # up-to-date so we simply use that instead of having to maintain our own rules 29414 logitech-udev-rules = solaar.udev;
··· 29407 29408 lmodern = callPackage ../data/fonts/lmodern { }; 29409 29410 # ltunifi and solaar both provide udev rules but solaar's rules are more 29411 # up-to-date so we simply use that instead of having to maintain our own rules 29412 logitech-udev-rules = solaar.udev;