me
/
guix
Archived
1
0
Fork 0
Code

gnu: pcb: Use gexp. 

* gnu/packages/engineering.scm (pcb)[arguments]: Use gexp and drop trailing #T
from build phases.
master
Ricardo Wurmus 2023-03-12 21:38:50 +01:00
parent c20e80b102
commit 6822730c8d
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/packages/engineering.scm
View File

@ -433,37 +433,33 @@ features.")))
"1a7rilp75faidny0r4fdwdxkflyrqp6svxv9lbg7h868293962iz")))) "1a7rilp75faidny0r4fdwdxkflyrqp6svxv9lbg7h868293962iz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'use-wish8.6 (add-after 'unpack 'use-wish8.6
(lambda _ (lambda _
(substitute* "configure" (substitute* "configure"
(("wish85") "wish8.6")) (("wish85") "wish8.6"))))
#t))
;; It checks for "xhost", which we don't have. This shouldn't ;; It checks for "xhost", which we don't have. This shouldn't
;; matter, because the test is supposed to be skipped, but it causes ;; matter, because the test is supposed to be skipped, but it causes
;; "run_tests.sh" (and thus the "check" phase) to fail. ;; "run_tests.sh" (and thus the "check" phase) to fail.
(add-after 'unpack 'fix-check-for-display (add-after 'unpack 'fix-check-for-display
(lambda _ (lambda _
(substitute* "tests/run_tests.sh" (substitute* "tests/run_tests.sh"
(("have_display=no") "have_display=yes")) (("have_display=no") "have_display=yes"))))
#t))
(add-after 'install 'wrap (add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; FIXME: Mesa tries to dlopen libudev.so.0 and fails. Pending a ;; FIXME: Mesa tries to dlopen libudev.so.0 and fails. Pending a
;; fix of the mesa package we wrap the pcb executable such that ;; fix of the mesa package we wrap the pcb executable such that
;; Mesa can find libudev.so.0 through LD_LIBRARY_PATH. ;; Mesa can find libudev.so.0 through LD_LIBRARY_PATH.
(let* ((out (assoc-ref outputs "out")) (let ((path (dirname
(path (dirname
(search-input-file inputs "/lib/libudev.so")))) (search-input-file inputs "/lib/libudev.so"))))
(wrap-program (string-append out "/bin/pcb") (wrap-program (string-append #$output "/bin/pcb")
`("LD_LIBRARY_PATH" ":" prefix (,path)))) `("LD_LIBRARY_PATH" ":" prefix (,path))))))
#t))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
(system "Xvfb :1 &") (system "Xvfb :1 &")
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1"))))))
#t)))))
(inputs (inputs
`(("dbus" ,dbus) `(("dbus" ,dbus)
("mesa" ,mesa) ("mesa" ,mesa)