me/guix
Archived
1
0
Fork 0
Code Activity

gnu: darktable: Fix build failure.

Browse source 
* gnu/packages/photo.scm (darktable)[arguments]: Move CPATH override from
 #:make-flags to a phase, so the GETENV call returns useful data.
This commit is contained in:
Marius Bakke 2019-12-12 01:24:32 +01:00
parent 8e53fe2b91
commit 17ac8bb670
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/photo.scm
View file

@ -374,18 +374,19 @@ photographic equipment.")
(arguments (arguments
`(#:tests? #f ; there are no tests `(#:tests? #f ; there are no tests
#:configure-flags '("-DBINARY_PACKAGE_BUILD=On") #:configure-flags '("-DBINARY_PACKAGE_BUILD=On")
#:make-flags
(list
(string-append "CPATH=" (assoc-ref %build-inputs "ilmbase")
"/include/OpenEXR:" (or (getenv "CPATH") "")))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'set-ldflags (add-before 'configure 'set-LDFLAGS-and-CPATH
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(setenv "LDFLAGS" (setenv "LDFLAGS"
(string-append (string-append
"-Wl,-rpath=" "-Wl,-rpath="
(assoc-ref outputs "out") "/lib/darktable")) (assoc-ref outputs "out") "/lib/darktable"))
;; Ensure the OpenEXR headers are found.
(setenv "CPATH"
(string-append (assoc-ref inputs "ilmbase")
"/include/OpenEXR:" (or (getenv "CPATH") "")))
#t))))) #t)))))
(native-inputs (native-inputs
`(("llvm" ,llvm-3.9.1) `(("llvm" ,llvm-3.9.1)