diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-04-15 18:13:38 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-04-15 18:13:56 +0200 |
| commit | 3158097940fe14273da2f568b13391ca0b2141e5 (patch) | |
| tree | 06589324c408fde3a171aaca9773738c7aa0e28e /gnu | |
| parent | d29843466abcd3e3a6e638c7c2b3511b82f70646 (diff) | |
| download | guix-patches-3158097940fe14273da2f568b13391ca0b2141e5.tar guix-patches-3158097940fe14273da2f568b13391ca0b2141e5.tar.gz | |
gnu: qt-4: Add "doc" output; use more standard directory names.
* gnu/packages/qt.scm (qt-4)[outputs]: New field.
(qt-4)[arguments]: Pass '-docdir', '-demosdir', and '-examplesdir'.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/qt.scm | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 1787059f51..8de1ffe398 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> +;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -235,12 +236,19 @@ developers using C++ or QML, a CSS & JavaScript like language.") (inputs `(,@(alist-delete "libjpeg" (package-inputs qt)) ("libjepg" ,libjpeg-8) ("libsm" ,libsm))) + + ;; Note: there are 37 MiB of examples and a '-exampledir' configure flags, + ;; but we can't make them a separate output because "out" and "examples" + ;; would refer to each other. + (outputs '("out" ;112MiB core + 37MiB examples + "doc")) ;280MiB of HTML + code (arguments `(#:phases (alist-replace 'configure (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) (substitute* '("configure") (("/bin/pwd") (which "pwd"))) @@ -248,6 +256,11 @@ developers using C++ or QML, a CSS & JavaScript like language.") "./configure" "-verbose" "-prefix" out + "-docdir" (string-append doc "/share/doc/qt-" ,version) + "-demosdir" (string-append out "/share/qt-" ,version + "/demos") + "-examplesdir" (string-append out "/share/qt-" ,version + "/examples") "-opensource" "-confirm-license" ;; explicitly link with dbus instead of dlopening it |