From 94bc20ad0f8f8f09dc115d10739f15f5f0bf11ed Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 13 Mar 2024 16:37:37 +0100
Subject: [PATCH 1/3] corrscope: 0.8.1 -> 0.9.0

---
 pkgs/applications/video/corrscope/default.nix | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/video/corrscope/default.nix b/pkgs/applications/video/corrscope/default.nix
index 8bd17d2f785e6..088e72456f380 100644
--- a/pkgs/applications/video/corrscope/default.nix
+++ b/pkgs/applications/video/corrscope/default.nix
@@ -1,36 +1,28 @@
-{ lib
+{ stdenv
+, lib
 , mkDerivationWith
 , python3Packages
 , fetchFromGitHub
-, fetchpatch
 , wrapQtAppsHook
 , ffmpeg
 , qtbase
+, qtwayland
 , testers
 , corrscope
 }:
 
 mkDerivationWith python3Packages.buildPythonApplication rec {
   pname = "corrscope";
-  version = "0.8.1";
-  format = "pyproject";
+  version = "0.9.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "corrscope";
     repo = "corrscope";
     rev = version;
-    hash = "sha256-pS7upOYZAjgR3lWxny8TNZEj3Rrbg+L90ANZWFO9UPQ=";
+    hash = "sha256-kOPhVm4epIhBSsgQVKNCoQ7DZcMG/b3sapxwwKo/V+U=";
   };
 
-  patches = [
-    # https://github.com/corrscope/corrscope/pull/446
-    (fetchpatch {
-      name = "remove-setuptools-dependency.patch";
-      url = "https://github.com/corrscope/corrscope/commit/70b123173a7a012d9f29d6d3a8960b85caf6cc79.patch";
-      hash = "sha256-YCtb7v8cGP0pdceAKeoempnRzw+LRKQqDb3AfN0z/9s=";
-    })
-  ];
-
   pythonRelaxDeps = [ "attrs" "ruamel.yaml" ];
 
   nativeBuildInputs = [
@@ -43,6 +35,8 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
   buildInputs = [
     ffmpeg
     qtbase
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+    qtwayland
   ];
 
   propagatedBuildInputs = with python3Packages; [

From 3f563e3b755177f0bb35d712674c9d4252b55e76 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 13 Mar 2024 16:38:35 +0100
Subject: [PATCH 2/3] corrscope: Migrate to by-name

---
 .../co/corrscope/package.nix}                 | 20 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 ----
 2 files changed, 9 insertions(+), 15 deletions(-)
 rename pkgs/{applications/video/corrscope/default.nix => by-name/co/corrscope/package.nix} (87%)

diff --git a/pkgs/applications/video/corrscope/default.nix b/pkgs/by-name/co/corrscope/package.nix
similarity index 87%
rename from pkgs/applications/video/corrscope/default.nix
rename to pkgs/by-name/co/corrscope/package.nix
index 088e72456f380..fbf46fc4aae89 100644
--- a/pkgs/applications/video/corrscope/default.nix
+++ b/pkgs/by-name/co/corrscope/package.nix
@@ -1,17 +1,14 @@
 { stdenv
 , lib
-, mkDerivationWith
 , python3Packages
 , fetchFromGitHub
-, wrapQtAppsHook
-, ffmpeg
-, qtbase
-, qtwayland
+, ffmpeg-full
+, libsForQt5
 , testers
 , corrscope
 }:
 
-mkDerivationWith python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "corrscope";
   version = "0.9.0";
   pyproject = true;
@@ -25,19 +22,20 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
 
   pythonRelaxDeps = [ "attrs" "ruamel.yaml" ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs = (with libsForQt5; [
     wrapQtAppsHook
-  ] ++ (with python3Packages; [
+  ]) ++ (with python3Packages; [
     poetry-core
     pythonRelaxDepsHook
   ]);
 
   buildInputs = [
-    ffmpeg
+    ffmpeg-full
+  ] ++ (with libsForQt5; [
     qtbase
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [
     qtwayland
-  ];
+  ]);
 
   propagatedBuildInputs = with python3Packages; [
     appdirs
@@ -58,7 +56,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
 
   preFixup = ''
     makeWrapperArgs+=(
-      --prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
+      --prefix PATH : ${lib.makeBinPath [ ffmpeg-full ]}
       "''${qtWrapperArgs[@]}"
     )
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cdaa063bcdd3e..726b4edc4a809 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30387,10 +30387,6 @@ with pkgs;
     inherit (gnome2) libgnomeui GConf;
   };
 
-  corrscope = libsForQt5.callPackage ../applications/video/corrscope {
-    ffmpeg = ffmpeg-full;
-  };
-
   cpeditor = libsForQt5.callPackage ../applications/editors/cpeditor { };
 
   csa = callPackage ../applications/audio/csa { };

From 5475817996d3d3487557284d76ca719db54d1a72 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 11 Apr 2024 23:43:15 +0200
Subject: [PATCH 3/3] corrscope: Switch to regular ffmpeg

ffplay is now enabled in the regular one. If a full ffmpeg is desired, then it can just be overridden.
---
 pkgs/by-name/co/corrscope/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/corrscope/package.nix b/pkgs/by-name/co/corrscope/package.nix
index fbf46fc4aae89..a9d83f1a22241 100644
--- a/pkgs/by-name/co/corrscope/package.nix
+++ b/pkgs/by-name/co/corrscope/package.nix
@@ -2,7 +2,7 @@
 , lib
 , python3Packages
 , fetchFromGitHub
-, ffmpeg-full
+, ffmpeg
 , libsForQt5
 , testers
 , corrscope
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
   ]);
 
   buildInputs = [
-    ffmpeg-full
+    ffmpeg
   ] ++ (with libsForQt5; [
     qtbase
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [
@@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec {
 
   preFixup = ''
     makeWrapperArgs+=(
-      --prefix PATH : ${lib.makeBinPath [ ffmpeg-full ]}
+      --prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
       "''${qtWrapperArgs[@]}"
     )
   '';