diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 230abcf28514..7f2e4207d0be 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -10,18 +10,21 @@ }: # Although we copy in the udev rules here, you probably just want to use -# logitech-udev-rules instead of adding this to services.udev.packages on NixOS +# `logitech-udev-rules`, which is an alias to `udev` output of this derivation, +# instead of adding this to `services.udev.packages` on NixOS, python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = version; - hash = "sha256-6z22MnhUL9Da3G7UDmZsBAi2gHLNpiFEwe+pAtnP91s="; + hash = "sha256-nDfVF7g0M54DRpkH1rnZB8o+nCV4A6b1uKMOMRQ3GbI="; }; + outputs = [ "out" "udev" ]; + nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ]; buildInputs = [ libappindicator librsvg ]; @@ -41,12 +44,9 @@ python3Packages.buildPythonApplication rec { postInstall = '' ln -s $out/bin/solaar $out/bin/solaar-cli - install -Dm444 -t $out/etc/udev/rules.d rules.d/*.rules + install -Dm444 -t $udev/etc/udev/rules.d rules.d-uinput/*.rules ''; - # No tests - doCheck = false; - meta = with lib; { description = "Linux devices manager for the Logitech Unifying Receiver"; longDescription = '' @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { ''; homepage = "https://pwr-solaar.github.io/Solaar/"; license = licenses.gpl2Only; - maintainers = with maintainers; [ spinus ysndr ]; + maintainers = with maintainers; [ spinus ysndr oxalica ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/logitech-udev-rules/default.nix b/pkgs/os-specific/linux/logitech-udev-rules/default.nix deleted file mode 100644 index 0b0e9e8f203d..000000000000 --- a/pkgs/os-specific/linux/logitech-udev-rules/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, stdenv, solaar }: - -# ltunifi and solaar both provide udev rules but solaar's rules are more -# up-to-date so we simply use that instead of having to maintain our own rules - -stdenv.mkDerivation { - pname = "logitech-udev-rules"; - inherit (solaar) version; - - buildCommand = '' - install -Dm444 -t $out/etc/udev/rules.d ${solaar.src}/rules.d/*.rules - ''; - - meta = with lib; { - description = "udev rules for Logitech devices"; - inherit (solaar.meta) homepage license platforms; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be30e3c9853c..b7cd3e14dc29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24961,7 +24961,9 @@ with pkgs; logiops = callPackage ../misc/drivers/logiops { }; - logitech-udev-rules = callPackage ../os-specific/linux/logitech-udev-rules { }; + # ltunifi and solaar both provide udev rules but solaar's rules are more + # up-to-date so we simply use that instead of having to maintain our own rules + logitech-udev-rules = solaar.udev; # lohit-fonts.assamese lohit-fonts.bengali lohit-fonts.devanagari lohit-fonts.gujarati lohit-fonts.gurmukhi # lohit-fonts.kannada lohit-fonts.malayalam lohit-fonts.marathi lohit-fonts.nepali lohit-fonts.odia