diff options
| author | Frank Doepper <github@woffs.de> | 2018-08-05 18:19:42 +0200 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-05 18:19:42 +0200 |
| commit | 4082e94b5c1028986d80a392c5a4a9ccae3eab4c (patch) | |
| tree | 23dbd0ed777fa97545a82b97538b055208c25aeb /pkgs/applications/video/shotcut/default.nix | |
| parent | bf1473f5e099b57b2363e97e680b36988a5de4f8 (diff) | |
| download | nixpkgs-4082e94b5c1028986d80a392c5a4a9ccae3eab4c.tar nixpkgs-4082e94b5c1028986d80a392c5a4a9ccae3eab4c.tar.gz nixpkgs-4082e94b5c1028986d80a392c5a4a9ccae3eab4c.tar.bz2 nixpkgs-4082e94b5c1028986d80a392c5a4a9ccae3eab4c.tar.lz nixpkgs-4082e94b5c1028986d80a392c5a4a9ccae3eab4c.tar.xz nixpkgs-4082e94b5c1028986d80a392c5a4a9ccae3eab4c.tar.zst nixpkgs-4082e94b5c1028986d80a392c5a4a9ccae3eab4c.zip | |
shotcut: 18.06.02 -> 18.08 (#44463)
and fix SHOTCUT_VERSION
Diffstat (limited to 'pkgs/applications/video/shotcut/default.nix')
| -rw-r--r-- | pkgs/applications/video/shotcut/default.nix | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 0df5d42ee0e..950cd27937c 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, pkgconfig, qtbase , qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols , qtgraphicaleffects, libmlt -, qmake, makeWrapper, fetchpatch, qttools }: +, qmake, makeWrapper, qttools }: assert stdenv.lib.versionAtLeast libmlt.version "6.8.0"; assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "18.06.02"; + version = "18.08"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1pqpgsb8ix1akq326chf46vvl5h02dwmdskskf2n6impygsy4x7v"; + sha256 = "1p2s4avm3bl5ippmgfzkkbb2w0xs4vhk2wbcd22g7bh1zq9w190n"; }; enableParallelBuilding = true; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt"; - qmakeFlags = [ "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" ]; + qmakeFlags = [ "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" "SHOTCUT_VERSION=${version}" ]; prePatch = '' sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp @@ -35,12 +35,6 @@ stdenv.mkDerivation rec { sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp ''; - patches = [ (fetchpatch { - url = https://github.com/mltframework/shotcut/commit/f304b7403cc7beb57b1610afd9c5c8173749e80b.patch; - name = "qt511.patch"; - sha256 = "1ynvyjchcb33a33x4w1ddnah2gyzmnm125ailgg6xy60lqsnsmp9"; - } ) ]; - postInstall = '' mkdir -p $out/share/shotcut cp -r src/qml $out/share/shotcut/ |