diff options
author | superherointj <5861043+superherointj@users.noreply.github.com> | 2022-07-06 16:19:48 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-06 16:19:48 -0300 |
commit | 4f8ba0216227c85cb9c0daea9e5d02540816b651 (patch) | |
tree | 7d1c49cd1e41a76aa97a7a93361d840b6939efdf | |
parent | 14445422a6c79ac7eecf2deb457ab5b150b1062c (diff) | |
parent | 20f946962596c3f99ce5d04f402799aa35f88da1 (diff) |
Merge pull request #179639 from SuperSamus/rare
rare: cleanup
-rw-r--r-- | pkgs/games/rare/default.nix | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/pkgs/games/rare/default.nix b/pkgs/games/rare/default.nix index 93a6296f67594..d23645242fdfb 100644 --- a/pkgs/games/rare/default.nix +++ b/pkgs/games/rare/default.nix @@ -1,23 +1,23 @@ -{ lib, fetchPypi, buildPythonApplication, makeDesktopItem, copyDesktopItems, qt5 -, pillow, psutil, pypresence, pyqt5, python, qtawesome, requests }: +{ lib, fetchFromGitHub, buildPythonApplication, qt5 +, psutil, pypresence, pyqt5, python, qtawesome, requests }: buildPythonApplication rec { pname = "rare"; version = "1.8.9"; - src = fetchPypi { - inherit version; - pname = "Rare"; - sha256 = "sha256-UEvGwWjr4FCsvyFz6Db3VnhVS6MS3FYzYSucumzOoEA="; + src = fetchFromGitHub { + owner = "Dummerle"; + repo = "Rare"; + rev = version; + sha256 = "sha256-2l8Id+bA5Ugb8+3ioiZ78dUtDusU8cvZEAMhmYBcJFc="; + fetchSubmodules = true; }; nativeBuildInputs = [ - copyDesktopItems qt5.wrapQtAppsHook ]; propagatedBuildInputs = [ - pillow psutil pypresence pyqt5 @@ -25,17 +25,6 @@ buildPythonApplication rec { requests ]; - desktopItems = [ - (makeDesktopItem { - name = pname; - exec = "rare"; - icon = "Rare"; - comment = meta.description; - desktopName = "Rare"; - genericName = "Rare (Epic Games Launcher Open Source Alternative)"; - }) - ]; - dontWrapQtApps = true; preBuild = '' @@ -44,7 +33,8 @@ buildPythonApplication rec { ''; postInstall = '' - install -Dm644 $out/${python.sitePackages}/rare/resources/images/Rare.png -t $out/share/pixmaps/ + install -Dm644 misc/rare.desktop -t $out/share/applications/ + install -Dm644 $out/${python.sitePackages}/rare/resources/images/Rare.png $out/share/pixmaps/rare.png ''; preFixup = '' |