diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-09-25 19:31:32 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-09-25 19:31:32 -0400 |
| commit | b3472597b74e5442a9b810d7a683f69be6539139 (patch) | |
| tree | e25fb3319f0a21cfe1330ae235b898776110f73e /pkgs/applications/video | |
| parent | fe5a295a229c791f079f5d83f4d59c409a0e5b90 (diff) | |
| parent | c455adcc42f9b2b62376b9fee99a0c5004a52425 (diff) | |
| download | nixpkgs-b3472597b74e5442a9b810d7a683f69be6539139.tar nixpkgs-b3472597b74e5442a9b810d7a683f69be6539139.tar.gz nixpkgs-b3472597b74e5442a9b810d7a683f69be6539139.tar.bz2 nixpkgs-b3472597b74e5442a9b810d7a683f69be6539139.tar.lz nixpkgs-b3472597b74e5442a9b810d7a683f69be6539139.tar.xz nixpkgs-b3472597b74e5442a9b810d7a683f69be6539139.tar.zst nixpkgs-b3472597b74e5442a9b810d7a683f69be6539139.zip | |
Merge branch 'staging-next' into staging
Fixes eval on darwin after #69072 Tested using maintainers/scripts/eval-release.sh before and after to see that the fix works
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/shotcut/default.nix | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 3edee15db5f..4636ce48b1a 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,10 +1,23 @@ -{ stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, mkDerivation -, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets -, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools }: +{ stdenv, fetchFromGitHub, fetchpatch, mkDerivation, SDL2, frei0r, gettext, mlt +, jack1, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets +, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools +}: assert stdenv.lib.versionAtLeast libmlt.version "6.8.0"; assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; +let + # https://github.com/mltframework/shotcut/issues/771 + fixVaapiRendering1 = fetchpatch { + url = "https://github.com/peti/shotcut/commit/038f6839298fc1e9e80ddf84fe168a78118bc625.patch"; + sha256 = "153z1g6criszd6gdkw4f5zk0gmh0jar6l2g8fzwjhhcvkdz30vbp"; + }; + fixVaapiRendering2 = fetchpatch { + url = "https://github.com/peti/shotcut/commit/653c485f92d2847fdac517e3f797c9254826ffab.patch"; + sha256 = "1qd0zgyahda72xh3avlg7lg0jq94wq5847154qlrgzj8b4n7vizw"; + }; +in + mkDerivation rec { pname = "shotcut"; version = "19.09.14"; @@ -16,6 +29,8 @@ mkDerivation rec { sha256 = "1cl8ba1n0h450r4n5mfqmyjaxvczs3m19blwxslqskvmxy5my3cn"; }; + patches = [ fixVaapiRendering1 fixVaapiRendering2 ]; + enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ @@ -33,8 +48,6 @@ 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 = [ |