git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #122751 from LeSuisse/clipgrab-use-ffmpeg4

clipgrab: use ffmpeg4

commiteb3fbc81639b6ef665bb27b0488797d42e7ecf2b authorSandro <sandro.jaeckel@gmail.com> dateTue 18 May 2021, 02:32 (6 years ago) parentfcc2d1c7e943b6
1 file changed+7−7
pkgs/applications/video/clipgrab/default.nix+7−7
pkgs/applications/video/clipgrab/default.nix+7−7
@@ -1,4 +1,4 @@
1−{ lib, fetchurl, makeDesktopItem, ffmpeg_3
1+{ lib, fetchurl, makeDesktopItem, ffmpeg
22, qmake, qttools, mkDerivation
33, qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine
44}:
@@ -13,19 +13,17 @@ mkDerivation rec {
1313 url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
1414 };
1515
16− buildInputs = [ ffmpeg_3 qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ];
16+ buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ];
1717 nativeBuildInputs = [ qmake qttools ];
1818
19− postPatch = lib.optionalString (ffmpeg_3 != null) ''
19+ postPatch = lib.optionalString (ffmpeg != null) ''
2020 substituteInPlace converter_ffmpeg.cpp \
21− --replace '"ffmpeg"' '"${ffmpeg_3.bin}/bin/ffmpeg"' \
22− --replace '"ffmpeg ' '"${ffmpeg_3.bin}/bin/ffmpeg '
21+ --replace '"ffmpeg"' '"${ffmpeg.bin}/bin/ffmpeg"' \
22+ --replace '"ffmpeg ' '"${ffmpeg.bin}/bin/ffmpeg '
2323 '';
2424
2525 qmakeFlags = [ "clipgrab.pro" ];
2626
27− enableParallelBuilding = true;
28−
2927 desktopItem = makeDesktopItem rec {
3028 name = "clipgrab";
3129 exec = name;
@@ -37,9 +35,11 @@ mkDerivation rec {
3735 };
3836
3937 installPhase = ''
38+ runHook preInstall
4039 install -Dm755 clipgrab $out/bin/clipgrab
4140 install -Dm644 icon.png $out/share/pixmaps/clipgrab.png
4241 cp -r ${desktopItem}/share/applications $out/share
42+ runHook postInstall
4343 '';
4444
4545 meta = with lib; {