summary refs log tree commit diff
path: root/pkgs/applications/video
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2020-01-05 14:13:47 +0100
committerPeter Simons <simons@cryp.to>2020-01-05 14:17:51 +0100
commit7391a22a4467884d269ae61b298818bc7593f336 (patch)
tree2a8cb8f2ed973f6e752aee27172692a8b12d9371 /pkgs/applications/video
parent605bd8c5435d048d19abd12c0e833599b9f73e0c (diff)
downloadnixpkgs-7391a22a4467884d269ae61b298818bc7593f336.tar
nixpkgs-7391a22a4467884d269ae61b298818bc7593f336.tar.gz
nixpkgs-7391a22a4467884d269ae61b298818bc7593f336.tar.bz2
nixpkgs-7391a22a4467884d269ae61b298818bc7593f336.tar.lz
nixpkgs-7391a22a4467884d269ae61b298818bc7593f336.tar.xz
nixpkgs-7391a22a4467884d269ae61b298818bc7593f336.tar.zst
nixpkgs-7391a22a4467884d269ae61b298818bc7593f336.zip
shotcut: update from version 19.09.14 to 19.12.31
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r--pkgs/applications/video/shotcut/default.nix24
1 files changed, 5 insertions, 19 deletions
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 4636ce48b1a..33ce5c18028 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -3,34 +3,20 @@
 , 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
+assert stdenv.lib.versionAtLeast libmlt.version "6.18.0";
+assert stdenv.lib.versionAtLeast mlt.version "6.18.0";
 
 mkDerivation rec {
   pname = "shotcut";
-  version = "19.09.14";
+  version = "19.12.31";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "shotcut";
     rev = "v${version}";
-    sha256 = "1cl8ba1n0h450r4n5mfqmyjaxvczs3m19blwxslqskvmxy5my3cn";
+    sha256 = "1vwgah8pp2kbd0iaz952d3bwxphk06yxqc0pi4hk1mklkh87qzm9";
   };
 
-  patches = [ fixVaapiRendering1 fixVaapiRendering2 ];
-
   enableParallelBuilding = true;
   nativeBuildInputs = [ pkgconfig qmake ];
   buildInputs = [
@@ -74,7 +60,7 @@ mkDerivation rec {
     '';
     homepage = https://shotcut.org;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ goibhniu woffs ];
+    maintainers = with maintainers; [ goibhniu woffs peti ];
     platforms = platforms.linux;
   };
 }