From bcf1b737b008a5a228d3c58200dc336575dafcd3 Mon Sep 17 00:00:00 2001
From: Asmir A <asmir.abdulahovic@gmail.com>
Date: Sat, 23 Mar 2024 17:50:07 +0100
Subject: [PATCH] zapzap: move to upstream package

---
 home/home_packages.nix      |  2 +-
 home/sway.nix               |  3 +--
 packages/zapzap/.nixd.json  |  1 -
 packages/zapzap/default.nix | 27 ---------------------------
 4 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 120000 packages/zapzap/.nixd.json
 delete mode 100644 packages/zapzap/default.nix

diff --git a/home/home_packages.nix b/home/home_packages.nix
index 9ecdf75..b92b7c6 100644
--- a/home/home_packages.nix
+++ b/home/home_packages.nix
@@ -100,13 +100,13 @@ in {
       x2goclient
       yewtube
       yt-dlp
+      zapzap
       zathura
       zeal-qt6
       zig
     ]
     ++ [
       inputs.swaysw.packages.${system}.swaysw
-      (pkgs.callPackage ../packages/zapzap/default.nix {})
       (pkgs.callPackage ../packages/viber/default.nix {})
       (pkgs.callPackage ../packages/bubblewrap/default.nix {})
     ];
diff --git a/home/sway.nix b/home/sway.nix
index dc88a42..08c6785 100644
--- a/home/sway.nix
+++ b/home/sway.nix
@@ -17,7 +17,6 @@
     ${pkgs.grim}/bin/grim -g "$GEOM" - | ${pkgs.wl-clipboard}/bin/wl-copy
   '';
   swaysw = inputs.swaysw.packages.${system}.swaysw;
-  zapzap = pkgs.callPackage ../packages/zapzap/default.nix {};
   viber = pkgs.callPackage ../packages/viber/default.nix {};
   term = "${pkgs.foot}/bin/footclient";
 in {
@@ -125,7 +124,7 @@ in {
 
         "Mod4+l" = ''
           exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${pkgs.python3}/bin/python3'';
-        "Mod4+h" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${zapzap}/bin/zapzap";
+        "Mod4+h" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${pkgs.zapzap}/bin/zapzap";
         "Mod4+j" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${viber}/bin/viber";
         "Mod4+y" = ''
           exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${pkgs.pulsemixer}/bin/pulsemixer'';
diff --git a/packages/zapzap/.nixd.json b/packages/zapzap/.nixd.json
deleted file mode 120000
index 0a1dd46..0000000
--- a/packages/zapzap/.nixd.json
+++ /dev/null
@@ -1 +0,0 @@
-../../.nixd.json
\ No newline at end of file
diff --git a/packages/zapzap/default.nix b/packages/zapzap/default.nix
deleted file mode 100644
index 8b0d805..0000000
--- a/packages/zapzap/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ fetchurl
-, makeWrapper
-, python3Packages
-, qt6
-}:
-
-python3Packages.buildPythonPackage rec {
-  name = "zapzap";
-  version = "5.2.1";
-  src = fetchurl {
-    url = "https://github.com/zapzap-linux/zapzap/archive/refs/tags/${version}.tar.gz";
-    hash = "sha256-qJ1gsEJokSPQalcmKRNv1k5m7u4R54LGw4axtZ4P7Zg=";
-  };
-  dontWrapQtApps = true;
-  propagatedBuildInputs = with python3Packages; [ pyqt6-webengine qt6.qtwayland qt6.qtsvg ];
-  nativeBuildInputs = [ qt6.wrapQtAppsHook makeWrapper ];
-  env = {
-    HOME = "/tmp";
-  };
-  preFixup = ''
-    makeWrapperArgs+=(
-      # Force the app to use QT_PLUGIN_PATH values from wrapper
-      --unset QT_PLUGIN_PATH
-      "''${qtWrapperArgs[@]}"
-    )
-  '';
-}