From 20f946962596c3f99ce5d04f402799aa35f88da1 Mon Sep 17 00:00:00 2001
From: Martino Fontana <tinozzo123@tutanota.com>
Date: Thu, 30 Jun 2022 00:46:50 +0200
Subject: rare: cleanup

---
 pkgs/games/rare/default.nix | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

(limited to 'pkgs/games')

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 = ''
-- 
cgit 1.4.1