diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-09-28 15:30:15 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-09-28 22:14:42 +0000 |
| commit | 80e4dc93ce4bb109cd00a98f0b39151f09de9d9b (patch) | |
| tree | 64aa611a6a199dc0f40fc56d050d99e125e5c830 /nixpkgs/pkgs/applications/video | |
| parent | bfa679f5a8e9beff6008ea0e9d5eabfa68018e20 (diff) | |
| parent | 2436c27541b2f52deea3a4c1691216a02152e729 (diff) | |
| download | nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.gz nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.bz2 nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.lz nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.xz nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.zst nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.zip | |
Merge commit '2436c27541b2f52deea3a4c1691216a02152e729'
Diffstat (limited to 'nixpkgs/pkgs/applications/video')
| -rw-r--r-- | nixpkgs/pkgs/applications/video/kino/default.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/applications/video/shotcut/default.nix | 23 |
2 files changed, 19 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/applications/video/kino/default.nix b/nixpkgs/pkgs/applications/video/kino/default.nix index 4ddd84433e88..1b9f0d0997a0 100644 --- a/nixpkgs/pkgs/applications/video/kino/default.nix +++ b/nixpkgs/pkgs/applications/video/kino/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { postInstall = " rpath=`patchelf --print-rpath \$out/bin/kino`; - for i in $\buildInputs; do + for i in $buildInputs; do echo adding \$i/lib rpath=\$rpath\${rpath:+:}\$i/lib done diff --git a/nixpkgs/pkgs/applications/video/shotcut/default.nix b/nixpkgs/pkgs/applications/video/shotcut/default.nix index 3edee15db5fc..4636ce48b1a5 100644 --- a/nixpkgs/pkgs/applications/video/shotcut/default.nix +++ b/nixpkgs/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 = [ |