diff --git a/pkgs/games/rare/default.nix b/pkgs/by-name/ra/rare/package.nix similarity index 71% rename from pkgs/games/rare/default.nix rename to pkgs/by-name/ra/rare/package.nix index d3d74c09a34b..17946ca8e507 100644 --- a/pkgs/games/rare/default.nix +++ b/pkgs/by-name/ra/rare/package.nix @@ -1,20 +1,12 @@ { lib, fetchFromGitHub, - buildPythonApplication, qt5, legendary-gl, - orjson, - pypresence, - pyqt5, - python, - qtawesome, - requests, - setuptools, - typing-extensions, + python3Packages, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "rare"; version = "1.10.11"; pyproject = true; @@ -27,12 +19,18 @@ buildPythonApplication rec { }; nativeBuildInputs = [ - setuptools qt5.wrapQtAppsHook ]; propagatedBuildInputs = [ legendary-gl + ]; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ orjson pypresence pyqt5 @@ -45,7 +43,7 @@ buildPythonApplication rec { postInstall = '' install -Dm644 misc/rare.desktop -t $out/share/applications/ - install -Dm644 $out/${python.sitePackages}/rare/resources/images/Rare.png $out/share/pixmaps/rare.png + install -Dm644 $out/${python3Packages.python.sitePackages}/rare/resources/images/Rare.png $out/share/pixmaps/rare.png ''; preFixup = '' @@ -55,12 +53,12 @@ buildPythonApplication rec { # Project has no tests doCheck = false; - meta = with lib; { + meta = { description = "GUI for Legendary, an Epic Games Launcher open source alternative"; homepage = "https://github.com/RareDevs/Rare"; maintainers = [ ]; - license = licenses.gpl3Only; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; mainProgram = "rare"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7929573bb49d..62998c298d1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2225,8 +2225,6 @@ with pkgs; psrecord = python3Packages.callPackage ../tools/misc/psrecord { }; - rare = python3Packages.callPackage ../games/rare { }; - renpy = callPackage ../by-name/re/renpy/package.nix { python3 = python312; }; rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { };