Merge pull request #333721 from eclairevoyant/shotcut-wl

shotcut: move to by-name, reformat, add wl support

pkgs/by-name/sh/shotcut/package.nix

@@ -1,23 +1,20 @@
-{ lib
-, fetchFromGitHub
-, stdenv
-, wrapQtAppsHook
-, substituteAll
-, SDL2
-, frei0r
-, ladspaPlugins
-, gettext
-, mlt
-, jack1
-, pkg-config
-, fftw
-, qtbase
-, qttools
-, qtmultimedia
-, qtcharts
-, cmake
-, Cocoa
-, gitUpdater
+{
+  lib,
+  fetchFromGitHub,
+  stdenv,
+  substituteAll,
+  SDL2,
+  frei0r,
+  ladspaPlugins,
+  gettext,
+  mlt,
+  jack1,
+  pkg-config,
+  fftw,
+  qt6,
+  cmake,
+  darwin,
+  gitUpdater,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "shotcut";
@@ -30,7 +27,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-9eQF3s4BAUK81/94z7cMkd2NWdNLVMraP08qsDmuAI8=";
   };
 
-  nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    qt6.wrapQtAppsHook
+  ];
+
   buildInputs = [
     SDL2
     frei0r
@@ -38,27 +40,29 @@ stdenv.mkDerivation (finalAttrs: {
     gettext
     mlt
     fftw
-    qtbase
-    qttools
-    qtmultimedia
-    qtcharts
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    Cocoa
-  ];
+    qt6.qtbase
+    qt6.qttools
+    qt6.qtmultimedia
+    qt6.qtcharts
+    qt6.qtwayland
+  ] ++ 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 ''
@@ -67,9 +71,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";
@@ -84,7 +86,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";
   };

pkgs/top-level/all-packages.nix

@@ -32400,10 +32400,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;
   };