diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-05-27 23:19:49 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-05-27 23:19:49 +0200 |
| commit | af018f5e0a1b7c67e9f40ca68929bd35b94206d3 (patch) | |
| tree | 8c3efe66f8ac1f6178357937c0a41c6f5ff8f0f8 /gnu/packages/xiph.scm | |
| parent | d84a7be6675bd647931d8eff9134d00dd5a6bd58 (diff) | |
| parent | 35066aa596931ef84922298c2760ceba69940cd1 (diff) | |
| download | guix-patches-af018f5e0a1b7c67e9f40ca68929bd35b94206d3.tar guix-patches-af018f5e0a1b7c67e9f40ca68929bd35b94206d3.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/xiph.scm')
| -rw-r--r-- | gnu/packages/xiph.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 2de9074f28..66c6c1373d 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> +;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013 David Thompson <dthompson2@worcester.edu> ;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in> @@ -25,6 +25,7 @@ #:use-module (gnu packages bison) #:use-module (gnu packages compression) #:use-module (gnu packages curl) + #:use-module (gnu packages doxygen) #:use-module (gnu packages libpng) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -231,12 +232,13 @@ meaning that audio is compressed in FLAC without any loss in quality.") (base32 "0s3vr2nxfxlf1k75iqpp4l78yf4gil3f0v778kvlngbchvaq23n4")))) (build-system gnu-build-system) - ;; FIXME: Add optional inputs doxygen (for documentation) and liboggz + (native-inputs `(("doxygen" ,doxygen) + ("pkg-config" ,pkg-config))) + ;; FIXME: Add optional input liboggz (inputs `(("bison" ,bison) ("libogg" ,libogg) ("libpng" ,libpng) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) +("python" ,python-wrapper) ("zlib" ,zlib))) (synopsis "kate, a karaoke and text codec for embedding in ogg") (description |