diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-05-18 02:32:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-18 02:32:57 +0200 |
| commit | eb3fbc81639b6ef665bb27b0488797d42e7ecf2b (patch) | |
| tree | 13ab8ae6c391290d03b537cd0163a97931c70788 /pkgs/applications/video | |
| parent | fcc2d1c1cd9a6550ab57a3687bdff8ee67311535 (diff) | |
| parent | 7e943b6a465e7efc049dfec304d9d427e4049b38 (diff) | |
Merge pull request #122751 from LeSuisse/clipgrab-use-ffmpeg4
clipgrab: use ffmpeg4
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/clipgrab/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index b24ff43ac671e..5d331d1b4a69d 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, makeDesktopItem, ffmpeg_3 +{ lib, fetchurl, makeDesktopItem, ffmpeg , qmake, qttools, mkDerivation , qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine }: @@ -13,19 +13,17 @@ mkDerivation rec { url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; }; - buildInputs = [ ffmpeg_3 qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ]; + buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ]; nativeBuildInputs = [ qmake qttools ]; - postPatch = lib.optionalString (ffmpeg_3 != null) '' + postPatch = lib.optionalString (ffmpeg != null) '' substituteInPlace converter_ffmpeg.cpp \ - --replace '"ffmpeg"' '"${ffmpeg_3.bin}/bin/ffmpeg"' \ - --replace '"ffmpeg ' '"${ffmpeg_3.bin}/bin/ffmpeg ' + --replace '"ffmpeg"' '"${ffmpeg.bin}/bin/ffmpeg"' \ + --replace '"ffmpeg ' '"${ffmpeg.bin}/bin/ffmpeg ' ''; qmakeFlags = [ "clipgrab.pro" ]; - enableParallelBuilding = true; - desktopItem = makeDesktopItem rec { name = "clipgrab"; exec = name; @@ -37,9 +35,11 @@ mkDerivation rec { }; installPhase = '' + runHook preInstall install -Dm755 clipgrab $out/bin/clipgrab install -Dm644 icon.png $out/share/pixmaps/clipgrab.png cp -r ${desktopItem}/share/applications $out/share + runHook postInstall ''; meta = with lib; { |