jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #56548 from dtzWill/update/clipgrab-3.8.2-qt5

Browse Source 
clipgrab: 3.7.2 -> 3.8.2, qt4 -> qt5
This commit is contained in:
Will Dietz 2019-03-07 15:13:37 -06:00 committed by GitHub
commit f835c66393
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/video/clipgrab/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
name = "clipgrab-${version}"; name = "clipgrab-${version}";
version = "3.7.2"; version = "3.8.2";
src = fetchurl { src = fetchurl {
sha256 = "1xkap4zgx8k0h0qfcqfwi3lj7s3mqsj0dp1cddiqmxbibbmg3rcc"; sha256 = "0dhiv1mldp5f555im6mkjxdh6iivn1hnx2xdaqa6wxzsrwrvv5dd";
# The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
url = "https://download.clipgrab.org/${name}.tar.gz"; url = "https://download.clipgrab.org/${name}.tar.gz";
}; };
buildInputs = [ ffmpeg qt4 ]; buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ];
nativeBuildInputs = [ qmake4Hook ]; nativeBuildInputs = [ qmake qttools ];
postPatch = stdenv.lib.optionalString (ffmpeg != null) '' postPatch = stdenv.lib.optionalString (ffmpeg != null) ''
substituteInPlace converter_ffmpeg.cpp \ substituteInPlace converter_ffmpeg.cpp \

2
pkgs/top-level/all-packages.nix
View File

@ -16476,7 +16476,7 @@ in
cligh = python3Packages.callPackage ../development/tools/github/cligh {}; cligh = python3Packages.callPackage ../development/tools/github/cligh {};
clipgrab = callPackage ../applications/video/clipgrab { }; clipgrab = qt5.callPackage ../applications/video/clipgrab { };
clipmenu = callPackage ../applications/misc/clipmenu { }; clipmenu = callPackage ../applications/misc/clipmenu { };