nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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'.
This commit is contained in:
Ludovic Courtès 2015-04-15 18:13:38 +02:00
parent d29843466a
commit 3158097940
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/qt.scm
View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; 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)) (inputs `(,@(alist-delete "libjpeg" (package-inputs qt))
("libjepg" ,libjpeg-8) ("libjepg" ,libjpeg-8)
("libsm" ,libsm))) ("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 (arguments
`(#:phases `(#:phases
(alist-replace (alist-replace
'configure 'configure
(lambda* (#:key outputs #:allow-other-keys) (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") (substitute* '("configure")
(("/bin/pwd") (which "pwd"))) (("/bin/pwd") (which "pwd")))
@ -248,6 +256,11 @@ developers using C++ or QML, a CSS & JavaScript like language.")
"./configure" "./configure"
"-verbose" "-verbose"
"-prefix" out "-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" "-opensource"
"-confirm-license" "-confirm-license"
;; explicitly link with dbus instead of dlopening it ;; explicitly link with dbus instead of dlopening it