aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2019-03-04 17:11:50 +0200
committerEfraim Flashner <efraim@flashner.co.il>2019-03-04 17:15:20 +0200
commite7ed996c531b5077f4466d8b9801a3509f00e0e3 (patch)
tree7b37e348dac17c7c818030157ae0c9e0c4fdcd8c
parentc36448131dfea5ddb13338d9059d53f5a752c144 (diff)
downloadguix-e7ed996c531b5077f4466d8b9801a3509f00e0e3.tar
guix-e7ed996c531b5077f4466d8b9801a3509f00e0e3.tar.gz
gnu: mkvtoolnix: Update to 31.0.0.
* gnu/packages/video.scm (mkvtoolnix): Update to 31.0.0. [arguments]: Remove unneeded 'with-extra-includes' flag, add flags to disable update checks and not use precompiled headers.
-rw-r--r--gnu/packages/video.scm15
1 files changed, 7 insertions, 8 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index bf9cb155f2..76fdec9f2f 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -316,7 +316,7 @@ H.264 (MPEG-4 AVC) video streams.")
(define-public mkvtoolnix
(package
(name "mkvtoolnix")
- (version "13.0.0")
+ (version "31.0.0")
(source
(origin
(method url-fetch)
@@ -324,7 +324,7 @@ H.264 (MPEG-4 AVC) video streams.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0hknnnnx9661igm1r73dc7aqxnnrl5a8yvyvr1nhd9ymn2klwpl5"))
+ "0d8va2iamzc7y3wi71z8mk2vnqvnkgwb2p7casdfp37400x8r2pr"))
(modules '((guix build utils)))
(snippet '(begin
;; Delete bundled libraries.
@@ -368,16 +368,15 @@ H.264 (MPEG-4 AVC) video streams.")
(assoc-ref %build-inputs "docbook-xsl")
"/xml/xsl/docbook-xsl-"
,(package-version docbook-xsl))
- (string-append "--with-extra-includes="
- (assoc-ref %build-inputs "nlohmann-json-cpp")
- "/include/nlohmann"))
+ "--enable-update-check=no"
+ "--enable-precompiled-headers=no")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'add-googletest
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
(symlink
- (string-append (assoc-ref %build-inputs "googletest")
- "/include/gtest") "lib/gtest")
+ (string-append (assoc-ref inputs "googletest")
+ "/include/gtest") "lib/gtest")
#t))
(replace 'build
(lambda _