diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-03-16 17:16:21 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-03-16 22:36:36 +0000 |
| commit | cb6d0ec12187e0c2c11b203f3d8fa62790628141 (patch) | |
| tree | 0ca0fedc67d5676e89438cffa3e0865eee0962e4 /nixpkgs/pkgs/applications/video/clipgrab/default.nix | |
| parent | 4d83b8e578d3a0b78d2694921c944172b009036a (diff) | |
| parent | da1a2b1eeafa66b4419b4f275396d8a731eccb61 (diff) | |
| download | nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.gz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.bz2 nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.lz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.xz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.zst nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.zip | |
Merge commit 'da1a2b1eeafa66b4419b4f275396d8a731eccb61'
Diffstat (limited to 'nixpkgs/pkgs/applications/video/clipgrab/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/video/clipgrab/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/applications/video/clipgrab/default.nix b/nixpkgs/pkgs/applications/video/clipgrab/default.nix index 3937244f25be..a94bb7ade33e 100644 --- a/nixpkgs/pkgs/applications/video/clipgrab/default.nix +++ b/nixpkgs/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 \ |