Skip to content

Commit 2bd2f80

Browse files
committed
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.)
1 parent 8d8fb83 commit 2bd2f80

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

pkgs/applications/video/linuxstopmotion/default.nix renamed to pkgs/by-name/st/stopmotion/package.nix

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,15 @@
33
stdenv,
44
fetchgit,
55
pkg-config,
6-
qmake,
7-
qtbase,
8-
qttools,
9-
qtmultimedia,
6+
qt5,
107
libvorbis,
118
libtar,
129
libxml2,
13-
wrapQtAppsHook,
1410
}:
1511

1612
stdenv.mkDerivation rec {
1713
version = "0.8.5";
18-
pname = "linuxstopmotion";
14+
pname = "stopmotion";
1915

2016
src = fetchgit {
2117
url = "https://git.code.sf.net/p/linuxstopmotion/code";
@@ -24,21 +20,21 @@ stdenv.mkDerivation rec {
2420
};
2521

2622
nativeBuildInputs = [
27-
qmake
23+
qt5.qmake
2824
pkg-config
29-
wrapQtAppsHook
25+
qt5.wrapQtAppsHook
3026
];
3127
buildInputs = [
32-
qtbase
33-
qttools
34-
qtmultimedia
28+
qt5.qtbase
29+
qt5.qttools
30+
qt5.qtmultimedia
3531
libvorbis
3632
libtar
3733
libxml2
3834
];
3935

4036
postPatch = ''
41-
substituteInPlace stopmotion.pro --replace '$$[QT_INSTALL_BINS]' '${lib.getDev qttools}/bin'
37+
substituteInPlace stopmotion.pro --replace '$$[QT_INSTALL_BINS]' '${lib.getDev qt5.qttools}/bin'
4238
'';
4339

4440
meta = with lib; {

pkgs/top-level/aliases.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,8 @@ mapAliases {
720720
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";
721721
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";
722722

723+
linuxstopmotion = stopmotion; # Added 2024-11-01
724+
723725
llvmPackages_git = (callPackages ../development/compilers/llvm { }).git;
724726

725727
lld_9 = throw "lld_9 has been removed from nixpkgs"; # Added 2024-04-08

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32160,8 +32160,6 @@ with pkgs;
3216032160
curses = ncurses;
3216132161
};
3216232162

32163-
linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { };
32164-
3216532163
sweethome3d = recurseIntoAttrs (
3216632164
(callPackage ../applications/misc/sweethome3d { }) //
3216732165
(callPackage ../applications/misc/sweethome3d/editors.nix {

0 commit comments

Comments
 (0)