From cd407c80dae36dbffd9e36c126e9bf7644a99ca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sat, 10 Aug 2024 12:13:23 -0400
Subject: [PATCH 1/3] shotcut: move to by-name

---
 .../sh}/shotcut/fix-mlt-ffmpeg-path.patch     |  0
 .../sh/shotcut/package.nix}                   | 20 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  4 ----
 3 files changed, 8 insertions(+), 16 deletions(-)
 rename pkgs/{applications/video => by-name/sh}/shotcut/fix-mlt-ffmpeg-path.patch (100%)
 rename pkgs/{applications/video/shotcut/default.nix => by-name/sh/shotcut/package.nix} (91%)

diff --git a/pkgs/applications/video/shotcut/fix-mlt-ffmpeg-path.patch b/pkgs/by-name/sh/shotcut/fix-mlt-ffmpeg-path.patch
similarity index 100%
rename from pkgs/applications/video/shotcut/fix-mlt-ffmpeg-path.patch
rename to pkgs/by-name/sh/shotcut/fix-mlt-ffmpeg-path.patch
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/by-name/sh/shotcut/package.nix
similarity index 91%
rename from pkgs/applications/video/shotcut/default.nix
rename to pkgs/by-name/sh/shotcut/package.nix
index 0f6ec1ebe718..1ddd55a6368b 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/by-name/sh/shotcut/package.nix
@@ -1,7 +1,6 @@
 { lib
 , fetchFromGitHub
 , stdenv
-, wrapQtAppsHook
 , substituteAll
 , SDL2
 , frei0r
@@ -11,12 +10,9 @@
 , jack1
 , pkg-config
 , fftw
-, qtbase
-, qttools
-, qtmultimedia
-, qtcharts
+, qt6
 , cmake
-, Cocoa
+, darwin
 , gitUpdater
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -30,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-9eQF3s4BAUK81/94z7cMkd2NWdNLVMraP08qsDmuAI8=";
   };
 
-  nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
+  nativeBuildInputs = [ pkg-config cmake qt6.wrapQtAppsHook ];
   buildInputs = [
     SDL2
     frei0r
@@ -38,12 +34,12 @@ stdenv.mkDerivation (finalAttrs: {
     gettext
     mlt
     fftw
-    qtbase
-    qttools
-    qtmultimedia
-    qtcharts
+    qt6.qtbase
+    qt6.qttools
+    qt6.qtmultimedia
+    qt6.qtcharts
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    Cocoa
+    darwin.apple_sdk.frameworks.Cocoa
   ];
 
   env.NIX_CFLAGS_COMPILE = "-DSHOTCUT_NOUPGRADE";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 438a7e074836..8ac0409589b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32438,10 +32438,6 @@ with pkgs;
 
   shod = callPackage ../applications/window-managers/shod { };
 
-  shotcut = qt6Packages.callPackage ../applications/video/shotcut {
-    inherit (darwin.apple_sdk.frameworks) Cocoa;
-  };
-
   shogun = callPackage ../applications/science/machine-learning/shogun {
     protobuf = protobuf_21;
   };

From 1bc8fd43108559c6ed29be85b2a4f7675d9c4312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sat, 10 Aug 2024 12:13:58 -0400
Subject: [PATCH 2/3] shotcut: nixfmt

---
 pkgs/by-name/sh/shotcut/package.nix | 66 ++++++++++++++++-------------
 1 file changed, 37 insertions(+), 29 deletions(-)

diff --git a/pkgs/by-name/sh/shotcut/package.nix b/pkgs/by-name/sh/shotcut/package.nix
index 1ddd55a6368b..43142f0de489 100644
--- a/pkgs/by-name/sh/shotcut/package.nix
+++ b/pkgs/by-name/sh/shotcut/package.nix
@@ -1,19 +1,20 @@
-{ lib
-, fetchFromGitHub
-, stdenv
-, substituteAll
-, SDL2
-, frei0r
-, ladspaPlugins
-, gettext
-, mlt
-, jack1
-, pkg-config
-, fftw
-, qt6
-, cmake
-, darwin
-, gitUpdater
+{
+  lib,
+  fetchFromGitHub,
+  stdenv,
+  substituteAll,
+  SDL2,
+  frei0r,
+  ladspaPlugins,
+  gettext,
+  mlt,
+  jack1,
+  pkg-config,
+  fftw,
+  qt6,
+  cmake,
+  darwin,
+  gitUpdater,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "shotcut";
@@ -26,7 +27,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-9eQF3s4BAUK81/94z7cMkd2NWdNLVMraP08qsDmuAI8=";
   };
 
-  nativeBuildInputs = [ pkg-config cmake qt6.wrapQtAppsHook ];
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    qt6.wrapQtAppsHook
+  ];
+
   buildInputs = [
     SDL2
     frei0r
@@ -38,23 +44,24 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qttools
     qt6.qtmultimedia
     qt6.qtcharts
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.Cocoa
-  ];
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
 
   env.NIX_CFLAGS_COMPILE = "-DSHOTCUT_NOUPGRADE";
-  cmakeFlags = [
-    "-DSHOTCUT_VERSION=${finalAttrs.version}"
-  ];
+  cmakeFlags = [ "-DSHOTCUT_VERSION=${finalAttrs.version}" ];
 
   patches = [
-    (substituteAll { inherit mlt; src = ./fix-mlt-ffmpeg-path.patch; })
+    (substituteAll {
+      inherit mlt;
+      src = ./fix-mlt-ffmpeg-path.patch;
+    })
   ];
 
   qtWrapperArgs = [
     "--set FREI0R_PATH ${frei0r}/lib/frei0r-1"
     "--set LADSPA_PATH ${ladspaPlugins}/lib/ladspa"
-    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([SDL2] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [jack1])}"
+    "--prefix LD_LIBRARY_PATH : ${
+      lib.makeLibraryPath ([ SDL2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ jack1 ])
+    }"
   ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -63,9 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s $out/Applications/Shotcut.app/Contents/MacOS/Shotcut $out/bin/shotcut
   '';
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "v";
-  };
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 
   meta = with lib; {
     description = "Free, open source, cross-platform video editor";
@@ -80,7 +85,10 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://shotcut.org";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ woffs peti ];
+    maintainers = with maintainers; [
+      woffs
+      peti
+    ];
     platforms = platforms.unix;
     mainProgram = "shotcut";
   };

From a600b3bda56261ea2cfeeaa789338af9b87a2859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sat, 10 Aug 2024 12:14:16 -0400
Subject: [PATCH 3/3] shotcut: add wayland platform support

---
 pkgs/by-name/sh/shotcut/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/sh/shotcut/package.nix b/pkgs/by-name/sh/shotcut/package.nix
index 43142f0de489..bb5227ad89a4 100644
--- a/pkgs/by-name/sh/shotcut/package.nix
+++ b/pkgs/by-name/sh/shotcut/package.nix
@@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qttools
     qt6.qtmultimedia
     qt6.qtcharts
+    qt6.qtwayland
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
 
   env.NIX_CFLAGS_COMPILE = "-DSHOTCUT_NOUPGRADE";