me/guix
Archived
1
0
Fork 0
Code Activity

gnu: hiawatha: Set sane run-time directory defaults.

Browse source 
* gnu/packages/web.scm (hiawatha)[arguments]: Set sane default
directories. Replace the 'remove-empty-dirs' phase with a
'install-no-empty-directories' one.
This commit is contained in:
Tobias Geerinckx-Rice 2018-10-04 19:52:03 +02:00
parent b9b53fb4ff
commit d8b042326d
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/web.scm
View file

@ -5195,17 +5195,20 @@ functions of Tidy.")
(string-append "-DENABLE_HTTP2=on") (string-append "-DENABLE_HTTP2=on")
(string-append "-DUSE_SYSTEM_NGHTTP2=on") (string-append "-DUSE_SYSTEM_NGHTTP2=on")
(string-append "-DENABLE_TOMAHAWK=on") (string-append "-DENABLE_TOMAHAWK=on")
(string-append "-DLOG_DIR=/var/log/hiawatha")
(string-append "-DPID_DIR=/run")
(string-append "-DWEBROOT_DIR=" (string-append "-DWEBROOT_DIR="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/share/hiawatha/html")) "/share/hiawatha/html")
(string-append "-DWORK_DIR=/var/lib/hiawatha"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'install 'remove-empty-dirs (add-after 'unpack 'install-no-empty-directories
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let* ((out (assoc-ref outputs "out"))) (substitute* "CMakeLists.txt"
;; The directories in "var" are empty, remove them. (("install\\(DIRECTORY DESTINATION" match)
(delete-file-recursively (string-append out "/var")) (string-append "#" match)))
#t))) #t))
(add-after 'install 'wrap (add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure 'hiawatha' finds 'mbedtls'. ;; Make sure 'hiawatha' finds 'mbedtls'.