tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

Merge pull request #144003 from sbruder/update-antimicrox

authored by Sandro and committed by GitHub 36c04ba3 0778565a

+14 -14
unified split
+11 -12
pkgs/tools/misc/antimicroX/default.nix pkgs/tools/misc/antimicrox/default.nix
··· 4 4 , extra-cmake-modules 5 5 , pkg-config 6 6 , SDL2 7 - , qtbase 8 7 , qttools 9 - , qtx11extras 10 8 , xorg 11 9 , fetchFromGitHub 12 10 , itstool 13 11 }: 14 12 15 13 mkDerivation rec { 16 - pname = "antimicroX"; 17 - version = "3.0.1"; 14 + pname = "antimicrox"; 15 + version = "3.2.0"; 18 16 19 17 src = fetchFromGitHub { 20 - owner = "juliagoda"; 21 - repo = "antimicroX"; 18 + owner = "AntiMicroX"; 19 + repo = pname; 22 20 rev = version; 23 - sha256 = "05asxlkgb4cgvpcyksw1cx8cz8nzi8hmw8b91lw92892j7a2r7wj"; 21 + sha256 = "sha256-brG3DTpWRYmDemTeteuuNbF0JoDAXdcFwO12JC6/0/Q="; 24 22 }; 25 23 26 24 nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; 27 25 buildInputs = [ 28 26 SDL2 29 - qtbase 30 27 qttools 31 - qtx11extras 32 - xorg.libX11 33 28 xorg.libXtst 34 - xorg.libXi 35 29 ]; 36 30 31 + postPatch = '' 32 + substituteInPlace CMakeLists.txt \ 33 + --replace "/usr/lib/udev/rules.d/" "$out/lib/udev/rules.d/" 34 + ''; 35 + 37 36 meta = with lib; { 38 37 description = "GUI for mapping keyboard and mouse controls to a gamepad"; 39 38 inherit (src.meta) homepage; 40 - maintainers = with maintainers; [ jb55 ]; 39 + maintainers = with maintainers; [ jb55 sbruder ]; 41 40 license = licenses.gpl3Plus; 42 41 platforms = with platforms; linux; 43 42 };
+2 -1
pkgs/top-level/aliases.nix
··· 54 54 ammonite-repl = ammonite; # added 2017-05-02 55 55 amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 56 56 angelfish = libsForQt5.plasmaMobileGear.angelfish; # added 2021-10-06 57 - antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06 57 + antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead."; # added 2020-08-06 58 + antimicroX = antimicrox; # added 2021-10-31 58 59 arduino_core = arduino-core; # added 2015-02-04 59 60 ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # added 2021-09-28 60 61 arora = throw "arora has been removed."; # added 2020-09-09
+1 -1
pkgs/top-level/all-packages.nix
··· 32011 32011 32012 32012 android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { }; 32013 32013 32014 - antimicroX = libsForQt5.callPackage ../tools/misc/antimicroX { }; 32014 + antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { }; 32015 32015 32016 32016 atari800 = callPackage ../misc/emulators/atari800 { }; 32017 32017