From f9942d9ea9eaec0dd755cc6961027062826524be Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Thu, 9 Oct 2025 07:11:47 -0300 Subject: [PATCH] cutechess: move to by-name, modernize --- .../cu/cutechess/package.nix} | 15 +++++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 insertions(+), 10 deletions(-) rename pkgs/{games/cutechess/default.nix => by-name/cu/cutechess/package.nix} (80%) diff --git a/pkgs/games/cutechess/default.nix b/pkgs/by-name/cu/cutechess/package.nix similarity index 80% rename from pkgs/games/cutechess/default.nix rename to pkgs/by-name/cu/cutechess/package.nix index 059c330f1a99..01156db18db4 100644 --- a/pkgs/games/cutechess/default.nix +++ b/pkgs/by-name/cu/cutechess/package.nix @@ -3,8 +3,7 @@ fetchFromGitHub, cmake, pkg-config, - wrapQtAppsHook, - qtbase, + qt5, lib, }: @@ -15,17 +14,17 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "cutechess"; repo = "cutechess"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-vhS3Eenxcq7D8E5WVON5C5hCTytcEVbYUeuCkfB0apA="; }; nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + qt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt5.qtbase ]; postInstall = '' @@ -35,12 +34,12 @@ stdenv.mkDerivation (finalAttrs: { install -Dm444 $src/docs/cutechess-engines.json.5 -t $out/share/man/man5/ ''; - meta = with lib; { + meta = { description = "GUI, CLI, and library for playing chess"; homepage = "https://cutechess.com/"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = with platforms; (linux ++ windows); + platforms = with lib.platforms; (linux ++ windows); mainProgram = "cutechess"; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a1c7a5c4ce0..9f12a7f6e70e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13366,8 +13366,6 @@ with pkgs; curseofwar = callPackage ../games/curseofwar { SDL = null; }; curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; }; - cutechess = qt5.callPackage ../games/cutechess { }; - cutemaze = qt6Packages.callPackage ../games/cutemaze { }; ddnet-server = ddnet.override { buildClient = false; };