diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix deleted file mode 100644 index ad86bdef80af..000000000000 --- a/pkgs/tools/misc/antimicro/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ mkDerivation, lib, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchFromGitHub }: - -mkDerivation rec { - pname = "antimicro"; - version = "2.23"; - - src = fetchFromGitHub { - owner = "AntiMicro"; - repo = "antimicro"; - rev = version; - sha256 = "1q40ayxwwyq85lc89cnj1cm2nar625h4vhh8dvmb2qcxczaggf4v"; - }; - - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ - SDL2 qtbase qttools xorg.libXtst - ]; - - meta = with lib; { - description = "GUI for mapping keyboard and mouse controls to a gamepad"; - inherit (src.meta) homepage; - maintainers = with maintainers; [ jb55 ]; - license = licenses.gpl3; - platforms = with platforms; linux; - broken = true; # 2018-04-10 - }; -} diff --git a/pkgs/tools/misc/antimicroX/default.nix b/pkgs/tools/misc/antimicroX/default.nix new file mode 100644 index 000000000000..23418ced829e --- /dev/null +++ b/pkgs/tools/misc/antimicroX/default.nix @@ -0,0 +1,44 @@ +{ mkDerivation +, lib +, cmake +, extra-cmake-modules +, pkgconfig +, SDL2 +, qtbase +, qttools +, qtx11extras +, xorg +, fetchFromGitHub +, itstool +}: + +mkDerivation rec { + pname = "antimicroX"; + version = "3.0"; + + src = fetchFromGitHub { + owner = "juliagoda"; + repo = "antimicroX"; + rev = version; + sha256 = "0li22sjl95233azxhyda36idnfzbb4b02wf57hnpnba6qvrlpwwl"; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig itstool ]; + buildInputs = [ + SDL2 + qtbase + qttools + qtx11extras + xorg.libX11 + xorg.libXtst + xorg.libXi + ]; + + meta = with lib; { + description = "GUI for mapping keyboard and mouse controls to a gamepad"; + inherit (src.meta) homepage; + maintainers = with maintainers; [ jb55 ]; + license = licenses.gpl3Plus; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5bc4021ea087..64c2d6f369e3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -42,6 +42,7 @@ mapAliases ({ aircrackng = aircrack-ng; # added 2016-01-14 alienfx = throw "alienfx has been removed."; # added 2019-12-08 ammonite-repl = ammonite; # added 2017-05-02 + antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06 arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 at_spi2_atk = at-spi2-atk; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3b61d59dba3..9fb087e8b6ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25943,7 +25943,7 @@ in android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { }; - antimicro = libsForQt5.callPackage ../tools/misc/antimicro { }; + antimicroX = libsForQt5.callPackage ../tools/misc/antimicroX { }; atari800 = callPackage ../misc/emulators/atari800 { };