From 55c4c014e77c72cb522d84934f3b5abb23458ff8 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sun, 31 Oct 2021 15:45:40 +0100 Subject: [PATCH] antimicrox: 3.0.1 -> 3.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This changes the source from the (now archived) original antimicroX to a fork that is actively maintained and includes new features like uinput support for wayland. Since upstream changed the executable name from antimicroX to antimicrox, this also changes the name of the derivation and the file names to work with Nix 2.4’s nix run and to be consistent. An alias for antimicroX is added to ensure existing configurations will continue working. --- .../{antimicroX => antimicrox}/default.nix | 23 +++++++++---------- pkgs/top-level/aliases.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) rename pkgs/tools/misc/{antimicroX => antimicrox}/default.nix (61%) diff --git a/pkgs/tools/misc/antimicroX/default.nix b/pkgs/tools/misc/antimicrox/default.nix similarity index 61% rename from pkgs/tools/misc/antimicroX/default.nix rename to pkgs/tools/misc/antimicrox/default.nix index 452906a1cf81..e248ac4a0c78 100644 --- a/pkgs/tools/misc/antimicroX/default.nix +++ b/pkgs/tools/misc/antimicrox/default.nix @@ -4,40 +4,39 @@ , extra-cmake-modules , pkg-config , SDL2 -, qtbase , qttools -, qtx11extras , xorg , fetchFromGitHub , itstool }: mkDerivation rec { - pname = "antimicroX"; - version = "3.0.1"; + pname = "antimicrox"; + version = "3.2.0"; src = fetchFromGitHub { - owner = "juliagoda"; - repo = "antimicroX"; + owner = "AntiMicroX"; + repo = pname; rev = version; - sha256 = "05asxlkgb4cgvpcyksw1cx8cz8nzi8hmw8b91lw92892j7a2r7wj"; + sha256 = "sha256-brG3DTpWRYmDemTeteuuNbF0JoDAXdcFwO12JC6/0/Q="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; buildInputs = [ SDL2 - qtbase qttools - qtx11extras - xorg.libX11 xorg.libXtst - xorg.libXi ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "/usr/lib/udev/rules.d/" "$out/lib/udev/rules.d/" + ''; + meta = with lib; { description = "GUI for mapping keyboard and mouse controls to a gamepad"; inherit (src.meta) homepage; - maintainers = with maintainers; [ jb55 ]; + maintainers = with maintainers; [ jb55 sbruder ]; license = licenses.gpl3Plus; platforms = with platforms; linux; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fc822f809e5a..6864f90b8f68 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -54,7 +54,8 @@ mapAliases ({ ammonite-repl = ammonite; # added 2017-05-02 amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 angelfish = libsForQt5.plasmaMobileGear.angelfish; # added 2021-10-06 - antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06 + antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead."; # added 2020-08-06 + antimicroX = antimicrox; # added 2021-10-31 arduino_core = arduino-core; # added 2015-02-04 ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # added 2021-09-28 arora = throw "arora has been removed."; # added 2020-09-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e692f29295c..646fd4d47155 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31822,7 +31822,7 @@ with pkgs; android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { }; - antimicroX = libsForQt5.callPackage ../tools/misc/antimicroX { }; + antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { }; atari800 = callPackage ../misc/emulators/atari800 { };