diff options
author | leenaars <leenaars@users.noreply.github.com> | 2018-08-12 12:09:36 +0200 |
---|---|---|
committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-12 12:09:36 +0200 |
commit | 3703799f9754887f5f951e5b721e7d42e85860c5 (patch) | |
tree | d95d68712a9d3017ea1c4338fdc467aa281e0298 /pkgs/applications/video | |
parent | 8121eebb9ad0b5bbc481ecb3ba3b3eb56c5f9861 (diff) |
qstopmotion: 2.3.2 -> 2.4.0 (#44642)
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/qstopmotion/default.nix | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 1fce30edbdf4e..2dd76b36d0576 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -1,20 +1,29 @@ -{ stdenv, fetchurl, qt5, ffmpeg, guvcview -, cmake, ninja, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils -, libv4l, pcre }: +{ stdenv, lib, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2 +, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils, libv4l, pcre +, qwt, extra-cmake-modules }: stdenv.mkDerivation rec { pname = "qstopmotion"; - version = "2.3.2"; + version = "2.4.0"; name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/${pname}/Version_2_3_2/${name}-Source.tar.gz"; - sha256 = "1vbiznwyc05jqg0dpmgxmvf7kdzmlck0i8v2c5d69kgrdnaypcrf"; + url = "mirror://sourceforge/project/${pname}/Version_2_4_0/${name}-Source.tar.gz"; + sha256 = "0pbyq6nrr9g3crlsng660768167s0fybvcpzbfc0w9kkhs2jwrr2"; }; - buildInputs = [ qt5.qtbase ffmpeg guvcview v4l_utils libv4l pcre ]; + buildInputs = with qt5; [ v4l_utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview + qwt qtquickcontrols qtimageformats qtxmlpatterns ]; - nativeBuildInputs = [ pkgconfig cmake ninja gettext libgphoto2 gphoto2 libxml2 libv4l ]; + nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules ninja + gettext libgphoto2 gphoto2 libxml2 libv4l ]; + + patchPhase = '' + substituteInPlace CMakeLists.txt \ + --replace "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml" \ + "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml Multimedia" + grep -rl 'qwt' . | xargs sed -i 's@<qwt/qwt_slider.h>@<qwt_slider.h>@g' + ''; meta = with stdenv.lib; { homepage = http://www.qstopmotion.org; |