@@ -1,32 +1,26 @@
1−{ stdenv, fetchgit, pkgconfig, qt4, SDL, SDL_image, libvorbis, libtar, libxml2
2−, gamin, qmake4Hook
3−}:
1+{ mkDerivation, lib, fetchgit, pkgconfig, qmake, qtbase, qttools, qtmultimedia, libvorbis, libtar, libxml2 }:
42
5−stdenv.mkDerivation rec {
6− version = "0.8";
3+mkDerivation rec {
4+ version = "0.8.5";
75 pname = "linuxstopmotion";
8−
6+
97 src = fetchgit {
10− url = "git://git.code.sf.net/p/linuxstopmotion/code";
11− rev = "refs/tags/${version}";
12− sha256 = "19v9d0v3laiwi0f1n92lvj2s5s1mxsrfygna0xyw9pkcnk3b26q6";
8+ url = "https://git.code.sf.net/p/linuxstopmotion/code";
9+ rev = version;
10+ sha256 = "1612lkwsfzc59wvdj2zbj5cwsyw66bwn31jrzjrxvygxdh4ab069";
1311 };
1412
15− nativeBuildInputs = [ pkgconfig ];
16− buildInputs = [ qt4 SDL SDL_image libvorbis libtar libxml2 gamin qmake4Hook ];
17−
18− patches = [ ./linuxstopmotion-fix-wrong-isProcess-logic.patch ];
13+ nativeBuildInputs = [ qmake pkgconfig ];
14+ buildInputs = [ qtbase qttools qtmultimedia libvorbis libtar libxml2 ];
1915
20− # Installation breaks without this
21− preInstall = ''
22− mkdir -p "$out/share/stopmotion/translations/"
23− cp -v build/*.qm "$out/share/stopmotion/translations/"
16+ postPatch = ''
17+ substituteInPlace stopmotion.pro --replace '$$[QT_INSTALL_BINS]' '${lib.getDev qttools}/bin'
2418 '';
2519
26− meta = with stdenv.lib; {
20+ meta = with lib; {
2721 description = "Create stop-motion animation movies";
2822 homepage = "http://linuxstopmotion.org/";
29− license = licenses.gpl2;
23+ license = licenses.gpl2Plus;
3024 platforms = platforms.linux;
3125 maintainers = [ maintainers.bjornfor ];
3226 };