From 5cf1df862d98a0ae2863c23e90c37e6e5af02e89 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Thu, 28 Mar 2024 14:37:44 +0100
Subject: [PATCH] onthespot: fix build issue

---
 .../default.nix => by-name/on/onthespot/package.nix}      | 8 +++++---
 pkgs/top-level/all-packages.nix                           | 2 --
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/{applications/misc/onthespot/default.nix => by-name/on/onthespot/package.nix} (90%)

diff --git a/pkgs/applications/misc/onthespot/default.nix b/pkgs/by-name/on/onthespot/package.nix
similarity index 90%
rename from pkgs/applications/misc/onthespot/default.nix
rename to pkgs/by-name/on/onthespot/package.nix
index 75ae769d33ff..7e52d4892fa5 100644
--- a/pkgs/applications/misc/onthespot/default.nix
+++ b/pkgs/by-name/on/onthespot/package.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , makeDesktopItem
 , python3
-, wrapQtAppsHook
+, libsForQt5
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec {
   nativeBuildInputs = with python3.pkgs; [
     copyDesktopItems
     pythonRelaxDepsHook
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   propagatedBuildInputs = with python3.pkgs; [
@@ -32,7 +32,6 @@ python3.pkgs.buildPythonApplication rec {
     packaging
     pillow
     protobuf
-    pyogg
     pyqt5
     pyqt5-sip
     pyxdg
@@ -46,6 +45,9 @@ python3.pkgs.buildPythonApplication rec {
   pythonRemoveDeps = [
     "PyQt5-Qt5"
     "PyQt5-stubs"
+    # Doesn't seem to be used in the sources and causes
+    # build issues
+    "PyOgg"
   ];
 
   pythonRelaxDeps = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4eb8ffd9795e..a4a98aa9642a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11378,8 +11378,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  onthespot = libsForQt5.callPackage ../applications/misc/onthespot { };
-
   opencorsairlink = callPackage ../tools/misc/opencorsairlink { };
 
   openfpgaloader = callPackage ../development/embedded/fpga/openfpgaloader { };