Merge pull request #122751 from LeSuisse/clipgrab-use-ffmpeg4

clipgrab: use ffmpeg4

authored by

Sandro and committed by
GitHub
eb3fbc81 fcc2d1c1

+7 -7
+7 -7
pkgs/applications/video/clipgrab/default.nix
··· 1 - { lib, fetchurl, makeDesktopItem, ffmpeg_3 2 , qmake, qttools, mkDerivation 3 , qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine 4 }: ··· 13 url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; 14 }; 15 16 - buildInputs = [ ffmpeg_3 qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ]; 17 nativeBuildInputs = [ qmake qttools ]; 18 19 - postPatch = lib.optionalString (ffmpeg_3 != null) '' 20 substituteInPlace converter_ffmpeg.cpp \ 21 - --replace '"ffmpeg"' '"${ffmpeg_3.bin}/bin/ffmpeg"' \ 22 - --replace '"ffmpeg ' '"${ffmpeg_3.bin}/bin/ffmpeg ' 23 ''; 24 25 qmakeFlags = [ "clipgrab.pro" ]; 26 - 27 - enableParallelBuilding = true; 28 29 desktopItem = makeDesktopItem rec { 30 name = "clipgrab"; ··· 37 }; 38 39 installPhase = '' 40 install -Dm755 clipgrab $out/bin/clipgrab 41 install -Dm644 icon.png $out/share/pixmaps/clipgrab.png 42 cp -r ${desktopItem}/share/applications $out/share 43 ''; 44 45 meta = with lib; {
··· 1 + { lib, fetchurl, makeDesktopItem, ffmpeg 2 , qmake, qttools, mkDerivation 3 , qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine 4 }: ··· 13 url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; 14 }; 15 16 + buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ]; 17 nativeBuildInputs = [ qmake qttools ]; 18 19 + postPatch = lib.optionalString (ffmpeg != null) '' 20 substituteInPlace converter_ffmpeg.cpp \ 21 + --replace '"ffmpeg"' '"${ffmpeg.bin}/bin/ffmpeg"' \ 22 + --replace '"ffmpeg ' '"${ffmpeg.bin}/bin/ffmpeg ' 23 ''; 24 25 qmakeFlags = [ "clipgrab.pro" ]; 26 27 desktopItem = makeDesktopItem rec { 28 name = "clipgrab"; ··· 35 }; 36 37 installPhase = '' 38 + runHook preInstall 39 install -Dm755 clipgrab $out/bin/clipgrab 40 install -Dm644 icon.png $out/share/pixmaps/clipgrab.png 41 cp -r ${desktopItem}/share/applications $out/share 42 + runHook postInstall 43 ''; 44 45 meta = with lib; {