diff --git a/pkgs/games/chessx/default.nix b/pkgs/by-name/ch/chessx/package.nix similarity index 74% rename from pkgs/games/chessx/default.nix rename to pkgs/by-name/ch/chessx/package.nix index e76cccc68532..94d6f8c7c8fe 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/by-name/ch/chessx/package.nix @@ -3,14 +3,9 @@ lib, pkg-config, zlib, - qtbase, - qtsvg, - qttools, - qtmultimedia, - qmake, fetchpatch, fetchurl, - wrapQtAppsHook, + libsForQt5, }: stdenv.mkDerivation (finalAttrs: { @@ -22,19 +17,25 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-76YOe1WpB+vdEoEKGTHeaWJLpCVE4RoyYu1WLy3Dxhg="; }; - nativeBuildInputs = [ - pkg-config - qmake - wrapQtAppsHook - ]; + nativeBuildInputs = + [ + pkg-config + ] + ++ (with libsForQt5; [ + qmake + wrapQtAppsHook + ]); - buildInputs = [ - qtbase - qtmultimedia - qtsvg - qttools - zlib - ]; + buildInputs = + [ + zlib + ] + ++ (with libsForQt5; [ + qtbase + qtmultimedia + qtsvg + qttools + ]); patches = # needed to backport patches to successfully build, due to broken release @@ -63,12 +64,12 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://chessx.sourceforge.io/"; description = "Browse and analyse chess games"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ luispedro ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ luispedro ]; + platforms = lib.platforms.linux; mainProgram = "chessx"; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5c9fd7fc541..0aab77e8f76e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14603,8 +14603,6 @@ with pkgs; cataclysm-dda-git = cataclysmDDA.git.tiles; - chessx = libsForQt5.callPackage ../games/chessx { }; - chiaki = libsForQt5.callPackage ../games/chiaki { }; chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { };