From 2bd2f80d4a6357410b2fb46b2dfa525b3ebfd1e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 1 Nov 2024 18:58:45 +0100
Subject: [PATCH] stopmotion: rename from linuxstopmotion

Upstream dropped the 'linux' prefix in newer versions. Take this
opportunity to move to the "by-name" hierarchy. (This also required
taking top-level qt5 as input.)
---
 .../st/stopmotion/package.nix}                | 20 ++++++++-----------
 pkgs/top-level/aliases.nix                    |  2 ++
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 10 insertions(+), 14 deletions(-)
 rename pkgs/{applications/video/linuxstopmotion/default.nix => by-name/st/stopmotion/package.nix} (79%)

diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/by-name/st/stopmotion/package.nix
similarity index 79%
rename from pkgs/applications/video/linuxstopmotion/default.nix
rename to pkgs/by-name/st/stopmotion/package.nix
index c8e72b471c68..d3c9e67ce39d 100644
--- a/pkgs/applications/video/linuxstopmotion/default.nix
+++ b/pkgs/by-name/st/stopmotion/package.nix
@@ -3,19 +3,15 @@
   stdenv,
   fetchgit,
   pkg-config,
-  qmake,
-  qtbase,
-  qttools,
-  qtmultimedia,
+  qt5,
   libvorbis,
   libtar,
   libxml2,
-  wrapQtAppsHook,
 }:
 
 stdenv.mkDerivation rec {
   version = "0.8.5";
-  pname = "linuxstopmotion";
+  pname = "stopmotion";
 
   src = fetchgit {
     url = "https://git.code.sf.net/p/linuxstopmotion/code";
@@ -24,21 +20,21 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
+    qt5.qmake
     pkg-config
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    qttools
-    qtmultimedia
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtmultimedia
     libvorbis
     libtar
     libxml2
   ];
 
   postPatch = ''
-    substituteInPlace stopmotion.pro --replace '$$[QT_INSTALL_BINS]' '${lib.getDev qttools}/bin'
+    substituteInPlace stopmotion.pro --replace '$$[QT_INSTALL_BINS]' '${lib.getDev qt5.qttools}/bin'
   '';
 
   meta = with lib; {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f967261b29b4..3eb9296dc85c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -720,6 +720,8 @@ mapAliases {
   linuxPackages_testing_bcachefs = throw "'linuxPackages_testing_bcachefs' has been removed, please use 'linuxPackages_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support";
   linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support";
 
+  linuxstopmotion = stopmotion; # Added 2024-11-01
+
   llvmPackages_git = (callPackages ../development/compilers/llvm { }).git;
 
   lld_9 = throw "lld_9 has been removed from nixpkgs"; # Added 2024-04-08
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4183bc9b8ba..c36270c67f3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32160,8 +32160,6 @@ with pkgs;
     curses = ncurses;
   };
 
-  linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { };
-
   sweethome3d = recurseIntoAttrs (
     (callPackage ../applications/misc/sweethome3d { }) //
     (callPackage ../applications/misc/sweethome3d/editors.nix {