From c791de683b9e0a496cc3c0e8154c8e24ec5377e9 Mon Sep 17 00:00:00 2001
From: Asmir A <asmir.abdulahovic@gmail.com>
Date: Sun, 14 Jan 2024 21:08:36 +0100
Subject: [PATCH] packages/zapzap: cleanup

---
 home/home_packages.nix      |  2 +-
 packages/zapzap/default.nix | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/home/home_packages.nix b/home/home_packages.nix
index 31ee843..40102db 100644
--- a/home/home_packages.nix
+++ b/home/home_packages.nix
@@ -111,7 +111,7 @@
     ++ [
       inputs.swaysw.packages.x86_64-linux.swaysw
       inputs.nvim.packages.x86_64-linux.nvim
-      (import ../packages/zapzap/default.nix {inherit pkgs;})
+      (pkgs.callPackage ../packages/zapzap/default.nix {})
       (pkgs.callPackage ../packages/viber/default.nix {})
       (pkgs.callPackage ../packages/bubblewrap/default.nix {})
       (pkgs.callPackage ../packages/stm32cubemx/default.nix {})
diff --git a/packages/zapzap/default.nix b/packages/zapzap/default.nix
index 7faf7fa..890b5df 100644
--- a/packages/zapzap/default.nix
+++ b/packages/zapzap/default.nix
@@ -1,16 +1,19 @@
-{ pkgs }:
+{ fetchurl
+, makeWrapper
+, python3Packages
+, qt6
+}:
 
-pkgs.python3Packages.buildPythonPackage {
+python3Packages.buildPythonPackage rec {
   name = "zapzap";
-  src = pkgs.fetchFromGitHub {
-    owner = "zapzap-linux";
-    repo = "zapzap";
-    rev = "22b237987a69c392d1fa7bea5c9495111c3efd9a";
-    hash = "sha256-VrpW7RYd91/MFFRfIzuFmdtykHfW4c/ky7q7CcS/FYE=";
+  version = "5.1-2";
+  src = fetchurl {
+    url = "https://github.com/zapzap-linux/zapzap/archive/refs/tags/${version}.tar.gz";
+    hash = "sha256-r5NhdXQ4Tl/wFrD1+sxFS10Z3lAcHcax5bi43Qa3ZI0=";
   };
   dontWrapQtApps = true;
-  propagatedBuildInputs = with pkgs.python3Packages; [ pyqt6-webengine qt6.qtwayland qt6.qtsvg ];
-  nativeBuildInputs = with pkgs; [ qt6.wrapQtAppsHook makeWrapper ];
+  propagatedBuildInputs = with python3Packages; [ pyqt6-webengine qt6.qtwayland qt6.qtsvg ];
+  nativeBuildInputs = [ qt6.wrapQtAppsHook makeWrapper ];
   env = {
     HOME = "/tmp";
   };