Commit 2bd2f80d authored by Bjørn Forsman's avatar Bjørn Forsman
Browse files

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.)
parent 8d8fb832
Loading
Loading
Loading
Loading
+8 −12
Original line number Diff line number Diff line
@@ -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; {
+2 −0
Original line number Diff line number Diff line
@@ -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
+0 −2
Original line number Diff line number Diff line
@@ -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 {