me/guix
Archived
1
0
Fork 0
Code Activity

gnu: geda-gaf: Use G-expressions.

Browse source 
* gnu/packages/engineering.scm (geda-gaf)[arguments]: Use G-expression to
remove the use of %build-inputs; also drop trailing #T from build phases.
This commit is contained in:
Ricardo Wurmus 2023-04-23 20:57:38 +02:00
parent c7a0445655
commit ea24609b61
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gnu/packages/engineering.scm
View file

@ -249,13 +249,13 @@ plans and designs.")
"19688b0671imy2i3jphcnq1120b8ymhr4wz2psiqylr82ljanqp8")))) "19688b0671imy2i3jphcnq1120b8ymhr4wz2psiqylr82ljanqp8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (list
(modify-phases %standard-phases #:phases
'(modify-phases %standard-phases
;; tests require a writable HOME ;; tests require a writable HOME
(add-before 'check 'set-home (add-before 'check 'set-home
(lambda _ (lambda _
(setenv "HOME" (getenv "TMPDIR")) (setenv "HOME" (getenv "TMPDIR"))))
#t))
(add-after 'unpack 'disable-failing-tests (add-after 'unpack 'disable-failing-tests
(lambda _ (lambda _
(substitute* "xorn/tests/Makefile.in" (substitute* "xorn/tests/Makefile.in"
@ -263,14 +263,13 @@ plans and designs.")
;; This test returns its correct result in an unexpected order. ;; This test returns its correct result in an unexpected order.
(substitute* "libgeda/scheme/unit-tests/t0402-config.scm" (substitute* "libgeda/scheme/unit-tests/t0402-config.scm"
(("\\(begin-config-test 'config-keys" m) (("\\(begin-config-test 'config-keys" m)
(string-append "#;" m))) (string-append "#;" m))))))
#t))) #:configure-flags
#:configure-flags #~(let ((pcb #$(this-package-input "pcb")))
(let ((pcb (assoc-ref %build-inputs "pcb"))) (list (string-append "--with-pcb-datadir=" pcb "/share")
(list (string-append "--with-pcb-datadir=" pcb "/share") (string-append "--with-pcb-lib-path="
(string-append "--with-pcb-lib-path=" pcb "/share/pcb/pcblib-newlib:"
pcb "/share/pcb/pcblib-newlib:" pcb "/share/pcb/newlib")))))
pcb "/share/pcb/newlib")))))
(inputs (inputs
`(("gamin" ,gamin) `(("gamin" ,gamin)
("glib" ,glib) ("glib" ,glib)