From f5a84301234e987c0c8203d30c377a64686c286c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 26 Jul 2024 23:35:12 +0200 Subject: [PATCH] mouse_m908: fix pname, remove uncessary &&, other cleanup --- pkgs/by-name/mo/mouse_m908/package.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/mo/mouse_m908/package.nix b/pkgs/by-name/mo/mouse_m908/package.nix index e41e9de62cbf..905b8fb1ef1e 100644 --- a/pkgs/by-name/mo/mouse_m908/package.nix +++ b/pkgs/by-name/mo/mouse_m908/package.nix @@ -4,14 +4,12 @@ , installShellFiles , fetchFromGitHub , pkg-config -}: stdenv.mkDerivation (finalAttrs: { - name = "mouse_m908"; +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mouse_m908"; version = "3.4"; - nativeBuildInputs = [ pkg-config installShellFiles ]; - - buildInputs = [ libusb1.dev ]; - src = fetchFromGitHub { owner = "dokutan"; repo = "mouse_m908"; @@ -19,6 +17,10 @@ sha256 = "sha256-sCAvjNpJYkp4G0KkDJtHOBR1vc80DZJtWR2W9gakkzQ="; }; + nativeBuildInputs = [ pkg-config installShellFiles ]; + + buildInputs = [ libusb1 ]; + # Uses proper nix directories rather than the ones specified in the makefile installPhase = '' runHook preInstall @@ -28,11 +30,11 @@ $out/share/doc/mouse_m908 \ $out/lib/udev/rules.d - cp mouse_m908 $out/bin/mouse_m908 && \ - cp mouse_m908.rules $out/lib/udev/rules.d && \ - cp examples/* $out/share/doc/mouse_m908 && \ - cp README.md $out/share/doc/mouse_m908 && \ - cp keymap.md $out/share/doc/mouse_m908 && \ + cp mouse_m908 $out/bin/mouse_m908 + cp mouse_m908.rules $out/lib/udev/rules.d + cp examples/* $out/share/doc/mouse_m908 + cp README.md $out/share/doc/mouse_m908 + cp keymap.md $out/share/doc/mouse_m908 installManPage mouse_m908.1 runHook postInstall