From 9805b9075efaa3be5605a7686328d500f69b2032 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 8 Sep 2023 18:14:06 -0400 Subject: makemkv: clarify license The `src_oss` source is LGPL 2.1 licensed, whereas `src_bin` is unfree. --- pkgs/applications/video/makemkv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index da22e9a10f114..f5b37d57cf980 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -80,7 +80,7 @@ in mkDerivation { expiration date. ''; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + license = [ licenses.unfree licenses.lgpl21 ]; homepage = "http://makemkv.com"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ titanous ]; -- cgit 1.4.1 From ae0f776b7200c82e0e78c6214ae0dad6369b742d Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 8 Sep 2023 17:14:27 -0400 Subject: makemkv: make reproducible --- pkgs/applications/video/makemkv/default.nix | 2 ++ pkgs/applications/video/makemkv/r13y.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/applications/video/makemkv/r13y.patch (limited to 'pkgs') diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index f5b37d57cf980..77b2bd7b63062 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -39,6 +39,8 @@ in mkDerivation { sourceRoot = "makemkv-oss-${version}"; + patches = [ ./r13y.patch ]; + nativeBuildInputs = [ autoPatchelfHook pkg-config ]; buildInputs = [ ffmpeg openssl qtbase zlib ]; diff --git a/pkgs/applications/video/makemkv/r13y.patch b/pkgs/applications/video/makemkv/r13y.patch new file mode 100644 index 0000000000000..fa980611997bf --- /dev/null +++ b/pkgs/applications/video/makemkv/r13y.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index 61c47fc..e08ffac 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -27,7 +27,7 @@ INSTALL=@INSTALL@ + OBJCOPY=@OBJCOPY@ + LD=@LD@ + BUILDINFO_ARCH_NAME=$(shell $(GCC) -dumpmachine) +-BUILDINFO_BUILD_DATE=$(shell date) ++BUILDINFO_BUILD_DATE=$(shell date -d @${SOURCE_DATE_EPOCH}) + + top_srcdir ?= . + INCF=-I$(top_srcdir)/ -- cgit 1.4.1 From 36a51e27cbcbd8c77ccf67cb79c738e391d0e9ad Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 8 Sep 2023 17:51:46 -0400 Subject: makemkv: enable parallel building MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reduces build time 2m50s → 1m50s with my hardware. --- pkgs/applications/video/makemkv/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs') diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 77b2bd7b63062..3305c9c84aa6a 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -41,6 +41,8 @@ in mkDerivation { patches = [ ./r13y.patch ]; + enableParallelBuilding = true; + nativeBuildInputs = [ autoPatchelfHook pkg-config ]; buildInputs = [ ffmpeg openssl qtbase zlib ]; -- cgit 1.4.1