From 82e7322128fdb5676eeb5a8993ba57c5350ed7f8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 28 Feb 2019 16:26:50 -0600 Subject: [PATCH] clipgrab: 3.7.2 -> 3.8.2, qt4 -> qt5 --- pkgs/applications/video/clipgrab/default.nix | 13 ++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 3937244f25be..a94bb7ade33e 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchurl, makeDesktopItem, ffmpeg, qt4, qmake4Hook }: +{ stdenv, fetchurl, makeDesktopItem, ffmpeg +, qmake, qttools +, qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine +}: stdenv.mkDerivation rec { name = "clipgrab-${version}"; - version = "3.7.2"; + version = "3.8.2"; src = fetchurl { - sha256 = "1xkap4zgx8k0h0qfcqfwi3lj7s3mqsj0dp1cddiqmxbibbmg3rcc"; + sha256 = "0dhiv1mldp5f555im6mkjxdh6iivn1hnx2xdaqa6wxzsrwrvv5dd"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${name}.tar.gz"; }; - buildInputs = [ ffmpeg qt4 ]; - nativeBuildInputs = [ qmake4Hook ]; + buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ]; + nativeBuildInputs = [ qmake qttools ]; postPatch = stdenv.lib.optionalString (ffmpeg != null) '' substituteInPlace converter_ffmpeg.cpp \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ef0f40e4c2b..489a9d71716a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16456,7 +16456,7 @@ in cligh = python3Packages.callPackage ../development/tools/github/cligh {}; - clipgrab = callPackage ../applications/video/clipgrab { }; + clipgrab = qt5.callPackage ../applications/video/clipgrab { }; clipmenu = callPackage ../applications/misc/clipmenu { };