summary refs log tree commit diff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2015-10-06 15:04:12 +0300
committerEfraim Flashner <efraim@flashner.co.il>2015-10-06 15:19:13 +0300
commit3f9f176b3a98a8c7dedb40f7fd14e8b5b3f45906 (patch)
treeeb90a48611c5cc23ff36f5a328d31b3929d72bcd
parente3302fec18c00f8e21f9c4df9d5728925835ff74 (diff)
downloadguix-3f9f176b3a98a8c7dedb40f7fd14e8b5b3f45906.tar.gz
gnu: libbluray: Upgrade to 0.9.1.
* gnu/packages/video.scm (libbluray): Upgrade to 0.9.1.
  [inputs]: Add "ant" and "icedtea7" to native-inputs.
  [arguments]: Set environment variable "JAVA_HOME".
-rw-r--r--gnu/packages/video.scm16
1 files changed, 13 insertions, 3 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index b46a9865f0..5af8b7e6f0 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -51,6 +51,7 @@
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages java)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages mp3)
@@ -812,7 +813,7 @@ YouTube.com and a few more sites.")
 (define-public libbluray
   (package
     (name "libbluray")
-    (version "0.7.0")
+    (version "0.9.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://download.videolan.org/videolan/"
@@ -820,9 +821,18 @@ YouTube.com and a few more sites.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "13dngs4b4cv29f6b825dq14n77mfhvk1kjb42axpq494pfgyp6zp"))))
+                "0kb9znxk6610vi0fjhqxn4z5i98nvxlsz1f8dakj99rg42livdl4"))))
     (build-system gnu-build-system)
-    (native-inputs `(("pkg-config" ,pkg-config)))
+    (arguments 
+      `(#:phases
+        (modify-phases %standard-phases
+          (add-after 'configure 'java-home
+            (lambda* (#:key inputs #:allow-other-keys)
+                     (setenv "JAVA_HOME" (assoc-ref inputs "icedtea7"))
+                     #t)))))
+    (native-inputs `(("ant" ,ant)
+                     ("icedtea7" ,icedtea7 "jdk")
+                     ("pkg-config" ,pkg-config)))
     (inputs
      `(("doxygen" ,doxygen)
        ("fontconfig" ,fontconfig)