diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-18 22:40:03 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-18 22:40:03 +0200 |
| commit | 105abdd52cfb3795a867ab5d80f314950b86eadd (patch) | |
| tree | 2133e245a7170698cf9ad3728a837b87ccc8a0ae /pkgs | |
| parent | 62791c3743629e08da4e2f6c58e7d64be0df6dd8 (diff) | |
| parent | c28659e2fbe37841bf2528a79759d13bf6ce87ef (diff) | |
| download | nixpkgs-105abdd52cfb3795a867ab5d80f314950b86eadd.tar nixpkgs-105abdd52cfb3795a867ab5d80f314950b86eadd.tar.gz nixpkgs-105abdd52cfb3795a867ab5d80f314950b86eadd.tar.bz2 nixpkgs-105abdd52cfb3795a867ab5d80f314950b86eadd.tar.lz nixpkgs-105abdd52cfb3795a867ab5d80f314950b86eadd.tar.xz nixpkgs-105abdd52cfb3795a867ab5d80f314950b86eadd.tar.zst nixpkgs-105abdd52cfb3795a867ab5d80f314950b86eadd.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/video/shotcut/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index a50ee8b5664..3edee15db5f 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -33,6 +33,8 @@ mkDerivation rec { sed 's_qApp->applicationDirPath(), "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/docks/encodedock.cpp NICE=$(type -P nice) sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp + # Fix VAAPI auto-config: https://github.com/mltframework/shotcut/issues/771 + sed 's#"-vaapi_device" << ":0"#"-vaapi_device" << "/dev/dri/renderD128"#' -i src/docks/encodedock.cpp ''; qtWrapperArgs = [ |