diff options
| author | maxine <35892750+amaxine@users.noreply.github.com> | 2023-10-06 18:20:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-06 18:20:10 +0200 |
| commit | 1168b1af5003641766a6994ddb9a989af12441d6 (patch) | |
| tree | e9e2db5250fc79708f32fe1e03e47ba04cc2e4c0 /pkgs/applications/video/makemkv | |
| parent | a3f36f93d9f72cc931fffb2340abc7790e870f22 (diff) | |
| parent | 36a51e27cbcbd8c77ccf67cb79c738e391d0e9ad (diff) | |
Merge pull request #254117 from amarshall/makemkv-reproducible
makemkv: make reproducible, enable parallel building, clarify license
Diffstat (limited to 'pkgs/applications/video/makemkv')
| -rw-r--r-- | pkgs/applications/video/makemkv/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/video/makemkv/r13y.patch | 13 |
2 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 42f356aac46df..bc6fec4c59159 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -39,6 +39,10 @@ in mkDerivation { sourceRoot = "makemkv-oss-${version}"; + patches = [ ./r13y.patch ]; + + enableParallelBuilding = true; + nativeBuildInputs = [ autoPatchelfHook pkg-config ]; buildInputs = [ ffmpeg openssl qtbase zlib ]; @@ -80,7 +84,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 ]; 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)/ |