diff --git a/pkgs/games/pentobi/default.nix b/pkgs/by-name/pe/pentobi/package.nix similarity index 85% rename from pkgs/games/pentobi/default.nix rename to pkgs/by-name/pe/pentobi/package.nix index 657891db9af6..816a3901cd7a 100644 --- a/pkgs/games/pentobi/default.nix +++ b/pkgs/by-name/pe/pentobi/package.nix @@ -1,22 +1,15 @@ { lib, - mkDerivation, + qt5, appstream, fetchFromGitHub, cmake, - gettext, - libxslt, librsvg, itstool, - qtbase, - qtquickcontrols2, - qtsvg, - qttools, - qtwebview, docbook_xsl, }: -mkDerivation rec { +qt5.mkDerivation rec { version = "20.0"; pname = "pentobi"; @@ -30,14 +23,14 @@ mkDerivation rec { nativeBuildInputs = [ cmake docbook_xsl - qttools + qt5.qttools ]; buildInputs = [ appstream - qtbase - qtsvg - qtquickcontrols2 - qtwebview + qt5.qtbase + qt5.qtsvg + qt5.qtquickcontrols2 + qt5.qtwebview itstool librsvg ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9db1b475a7a..4456a23934ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12349,8 +12349,6 @@ with pkgs; papermc = papermcServers.papermc; - pentobi = libsForQt5.callPackage ../games/pentobi { }; - pokerth = libsForQt5.callPackage ../games/pokerth { protobuf = protobuf_21; };