aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2015-10-06 20:22:09 +0300
committerEfraim Flashner <efraim@flashner.co.il>2015-10-06 20:22:09 +0300
commit2da45ebe56e4ac9821ae0f563346c97b3819d1df (patch)
tree5018eb676758ef519c38b3b39f6bb87dc6f285d0
parent69762e3c921d2af6bb7943ad0719aa1345b2f40e (diff)
downloadgnu-guix-2da45ebe56e4ac9821ae0f563346c97b3819d1df.tar
gnu-guix-2da45ebe56e4ac9821ae0f563346c97b3819d1df.tar.gz
gnu: libbluray: Remove java as native-input.
* gnu/packages/video.scm (libbluray)[inputs]: Remove "ant" and "icedtea" as native-inputs. [arguments]: Remove environmental variable "JAVA_HOME". Add configure flag to disable java.
-rw-r--r--gnu/packages/video.scm13
1 files changed, 2 insertions, 11 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c36d7a8f11..5ec225eb2f 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -51,7 +51,6 @@
#: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)
@@ -823,16 +822,8 @@ YouTube.com and a few more sites.")
(base32
"0kb9znxk6610vi0fjhqxn4z5i98nvxlsz1f8dakj99rg42livdl4"))))
(build-system gnu-build-system)
- (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)))
+ (arguments `(#:configure-flags '("--disable-bdjava")))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(inputs
`(("doxygen" ,doxygen)
("fontconfig" ,fontconfig)