Merge pull request #91776 from KoviRobi/antimicro-to-antimicroX

antimicro 2.3 -> antimicroX 3.0
This commit is contained in:
Daniël de Kok 2020-08-06 17:41:38 +02:00 committed by GitHub
commit 39806bc65e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 46 additions and 28 deletions

View File

@ -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
};
}

View File

@ -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;
};
}

View File

@ -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

View File

@ -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 { };