From e387f0600ca884cefecea18203a57313b6a0c6b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Tue, 4 May 2021 09:14:37 +0200 Subject: [PATCH 1/4] lightworks: 14.0.0 -> 2021.2 (cherry picked from commit 2c3d045bc31e7baab833b1d4adb553263e75fe2e) --- pkgs/applications/video/lightworks/default.nix | 13 ++++++++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 0312c34bf70..9fcf40ec0a5 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv , gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU -, nvidia_cg_toolkit, zlib, openssl, portaudio +, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsaLib, udev }: let fullPath = lib.makeLibraryPath [ @@ -11,22 +11,25 @@ let libjpeg_original glib pango + libGL libGLU nvidia_cg_toolkit zlib openssl - portaudio + libuuid + alsaLib + udev ]; lightworks = stdenv.mkDerivation rec { - version = "14.0.0"; + version = "2021.2"; pname = "lightworks"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "http://downloads.lwks.com/v14/lwks-14.0.0-amd64.deb"; - sha256 = "66eb9f9678d979db76199f1c99a71df0ddc017bb47dfda976b508849ab305033"; + url = "https://cdn.lwks.com/releases/2021.2/lightworks_2021.2_r128258.deb"; + sha256 = "sha256-IRzoysfGh/P+Xr50+cIjjaKuxdSzgCmJDICFtekfE3Y="; } else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d45fa4e5e1..a161dee933f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24758,9 +24758,7 @@ in liferea = callPackage ../applications/networking/newsreaders/liferea { }; - lightworks = callPackage ../applications/video/lightworks { - portaudio = portaudio2014; - }; + lightworks = callPackage ../applications/video/lightworks { }; lingot = callPackage ../applications/audio/lingot { }; From 089308ac910b2cc5539c3953e95c630ef0f4b159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Tue, 4 May 2021 09:14:45 +0200 Subject: [PATCH 2/4] lightworks: add me as a maintainer (cherry picked from commit ccb691c7d156f26857159d324b788c0e3789322a) --- pkgs/applications/video/lightworks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 9fcf40ec0a5..ecc5a6491dd 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -85,7 +85,7 @@ in buildFHSUserEnv { description = "Professional Non-Linear Video Editor"; homepage = "https://www.lwks.com/"; license = lib.licenses.unfree; - maintainers = [ lib.maintainers.antonxy ]; + maintainers = with lib.maintainers; [ antonxy vojta001 ]; platforms = [ "x86_64-linux" ]; }; } From 9f537a52df4d901d7b0081cc58a71e368939b784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Wed, 26 May 2021 11:23:44 +0200 Subject: [PATCH 3/4] lightworks: 2021.2 -> 2021.2.1 (cherry picked from commit a9edf3b544aba334814ea830b8650a38e56b69c3) --- pkgs/applications/video/lightworks/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index ecc5a6491dd..9d940cd29b4 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -22,14 +22,15 @@ let ]; lightworks = stdenv.mkDerivation rec { - version = "2021.2"; + version = "2021.2.1"; + rev = "128456"; pname = "lightworks"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://cdn.lwks.com/releases/2021.2/lightworks_2021.2_r128258.deb"; - sha256 = "sha256-IRzoysfGh/P+Xr50+cIjjaKuxdSzgCmJDICFtekfE3Y="; + url = "https://cdn.lwks.com/releases/${version}/lightworks_${lib.versions.majorMinor version}_r${rev}.deb"; + sha256 = "sha256-GkTg43IUF1NgEm/wT9CZw68Dw/R2BYBU/F4bsCxQowQ="; } else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; From 5da4cd9607e6497363f3f6471b0b8b16b3139572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Sat, 5 Jun 2021 10:32:59 +0200 Subject: [PATCH 4/4] lightworks: fix audio playback (cherry picked from commit 201cc75bcb41cde2581a994c3162014d85cead82) --- pkgs/applications/video/lightworks/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 9d940cd29b4..81b5be75f3b 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv , gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU -, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsaLib, udev +, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsaLib, udev, libjack2 }: let fullPath = lib.makeLibraryPath [ @@ -18,6 +18,7 @@ let openssl libuuid alsaLib + libjack2 udev ];