diff options
author | Lassulus <github@lassul.us> | 2020-08-20 23:06:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-20 23:06:57 +0200 |
commit | 6fc5a6ba4f8d9f3dd5472f7c1b713df684b2c9fc (patch) | |
tree | ffcea336a8062f08ffd396f69d99531b084012b1 /pkgs/applications/video | |
parent | bb67a84bab4206e8bb010195994c55ad065c4574 (diff) | |
parent | 4b9dca0f4598eb27eeba363c3af6a73d60a00ea9 (diff) | |
download | nixpkgs-6fc5a6ba4f8d9f3dd5472f7c1b713df684b2c9fc.tar nixpkgs-6fc5a6ba4f8d9f3dd5472f7c1b713df684b2c9fc.tar.gz nixpkgs-6fc5a6ba4f8d9f3dd5472f7c1b713df684b2c9fc.tar.bz2 nixpkgs-6fc5a6ba4f8d9f3dd5472f7c1b713df684b2c9fc.tar.lz nixpkgs-6fc5a6ba4f8d9f3dd5472f7c1b713df684b2c9fc.tar.xz nixpkgs-6fc5a6ba4f8d9f3dd5472f7c1b713df684b2c9fc.tar.zst nixpkgs-6fc5a6ba4f8d9f3dd5472f7c1b713df684b2c9fc.zip |
Merge pull request #92163 from doronbehar/vokoscreen-ffmpeg4
vokoscreen: use latest ffmpeg
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/vokoscreen/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix index 0cd3c814b17..94d0de20ccf 100644 --- a/pkgs/applications/video/vokoscreen/default.nix +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, mkDerivation , pkgconfig, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr -, ffmpeg_3 +, ffmpeg }: mkDerivation rec { @@ -35,7 +35,7 @@ mkDerivation rec { ''; postConfigure = '' - substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg_3} + substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg} ''; meta = with stdenv.lib; { |