diff options
| author | Harrison Houghton <hora.rhino@gmail.com> | 2021-09-15 10:57:28 -0400 |
|---|---|---|
| committer | Harrison Houghton <hora.rhino@gmail.com> | 2021-09-24 07:56:16 -0400 |
| commit | d80676b76badc497bf4ba657dc019ff5a0fb5945 (patch) | |
| tree | 7ec846d36aa6f2a7859dd74aced4b219d500e251 | |
| parent | 98ea8a9dba31705e437c78b95f7ed9d200e0f309 (diff) | |
| download | nixpkgs-d80676b76badc497bf4ba657dc019ff5a0fb5945.tar nixpkgs-d80676b76badc497bf4ba657dc019ff5a0fb5945.tar.gz nixpkgs-d80676b76badc497bf4ba657dc019ff5a0fb5945.tar.bz2 nixpkgs-d80676b76badc497bf4ba657dc019ff5a0fb5945.tar.lz nixpkgs-d80676b76badc497bf4ba657dc019ff5a0fb5945.tar.xz nixpkgs-d80676b76badc497bf4ba657dc019ff5a0fb5945.tar.zst nixpkgs-d80676b76badc497bf4ba657dc019ff5a0fb5945.zip | |
shotcut: 21.03.21 -> 21.09.20
Fixes build with new mlt++ library changes. Co-Authored-By: "Frank Doepper" <github@woffs.de>
| -rw-r--r-- | pkgs/applications/video/shotcut/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 27aeec152d1..3b6116d5a06 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -25,13 +25,13 @@ assert lib.versionAtLeast mlt.version "6.24.0"; mkDerivation rec { pname = "shotcut"; - version = "21.03.21"; + version = "21.09.20"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "UdeHbNkJ0U9FeTmpbcU4JxiyIHkrlC8ErhtY6zdCZEk="; + sha256 = "1y46n5gmlayfl46l0vhg5g5dbbc0sg909mxb68sia0clkaas8xrh"; }; nativeBuildInputs = [ pkg-config qmake ]; @@ -57,7 +57,7 @@ mkDerivation rec { ]; prePatch = '' - sed 's_shotcutPath, "melt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp + sed 's_shotcutPath, "melt[^"]*"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp sed 's_qApp->applicationDirPath(), "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/docks/encodedock.cpp NICE=$(type -P nice) |