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

gnu: qt-4: Remove reference from "out" to "doc". 

* gnu/packages/qt.scm (qt-4)[arguments]: Remove '-docdir' configure flag.
  Add 'move-doc' phase.
master
Ludovic Courtès 2015-06-27 21:37:50 +02:00
parent ff1989a599
commit 4b0f2ef743
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/qt.scm
View File

@ -264,7 +264,9 @@ developers using C++ or QML, a CSS & JavaScript like language.")
"./configure"
"-verbose"
"-prefix" out
"-docdir" (string-append doc "/share/doc/qt-" ,version)
;; Note: Don't pass '-docdir' since 'qmake' and
;; libQtCore would record its value, thereby defeating
;; the whole point of having a separate output.
"-datadir" (string-append out "/share/qt-" ,version
"/data")
"-importdir" (string-append out "/lib/qt-4"
@ -296,7 +298,23 @@ developers using C++ or QML, a CSS & JavaScript like language.")
"-no-sse4.1"
"-no-sse4.2"
"-no-avx"
"-no-neon"))))))))))
"-no-neon")))))
(add-after
'install 'move-doc
(lambda* (#:key outputs #:allow-other-keys)
;; Because of qt4-documentation-path.patch, documentation ends up
;; being installed in OUT. Move it to the right place.
(let* ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc"))
(olddoc (string-append out "/doc"))
(docdir (string-append doc "/share/doc/qt-" ,version)))
(mkdir-p (dirname docdir))
;; Note: We can't use 'rename-file' here because OUT and DOC are
;; different "devices" due to bind-mounts.
(copy-recursively olddoc docdir)
(delete-file-recursively olddoc)
#t))))))))
(define-public python-sip
(package