ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: engineering: Add 'bash' input for 'wrap-program'.

Browse source 
It is required for cross-compilation.

* gnu/packages/engineering.scm
(librecad): Remove trailing #t.
[inputs]: Add 'bash-minimal'.
(volk, freehdl, freecad, solvespace, cura): Likewise.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I66ce8c602706ef0bf6a9c7bc60f51e34f0e823d5
This commit is contained in:
Maxime Devos 2021-07-02 12:06:22 +02:00 committed by Ludovic Courtès
parent 632834696b
commit 3269096e46
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
gnu/packages/engineering.scm
View file

@ -206,7 +206,7 @@ (define-public librecad
(mkdir-p share)
(copy-recursively "unix/resources" share)))))))
(inputs
(list boost muparser freetype qtbase-5 qtsvg-5))
(list bash-minimal boost muparser freetype qtbase-5 qtsvg-5))
(native-inputs
(list pkg-config which))
(home-page "https://librecad.org/")
@ -1429,9 +1429,10 @@ (define-public volk
`("PATH" ":" prefix
(,(string-append python "/bin:"))))))))))
(inputs
`(("boost" ,boost)
("python" ,python-wrapper)
("python-mako" ,python-mako)))
(list bash-minimal ;for wrap-program
boost
python-wrapper
python-mako))
(home-page "https://www.libvolk.org/")
(synopsis "Vector-Optimized Library of Kernels")
(description
@ -2284,8 +2285,7 @@ (define-public freehdl
(lambda _
(substitute* "v2cc/gvhdl.in"
(("--mode=link") "--mode=link --tag=CXX")
(("-lm") "-lm FREEHDL/lib/freehdl/libieee.la"))
#t))
(("-lm") "-lm FREEHDL/lib/freehdl/libieee.la"))))
(add-after 'patch-gvhdl 'patch-freehdl-gennodes
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "freehdl/freehdl-gennodes.in"
@ -2293,8 +2293,7 @@ (define-public freehdl
(search-input-file inputs "/bin/guile"))
(("\\(debug") ";(debug")
(("\\(@ ") "(apply-emit")
(("\\(@@ ") "(apply-mini-format"))
#t))
(("\\(@@ ") "(apply-mini-format"))))
(add-after 'configure 'patch-freehdl-pc
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "freehdl.pc"
@ -2303,8 +2302,7 @@ (define-public freehdl
"/bin/g++"))
(("=libtool")
(string-append "=" (assoc-ref inputs "libtool")
"/bin/libtool")))
#t))
"/bin/libtool")))))
(add-after 'install-scripts 'make-wrapper
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
@ -2323,10 +2321,11 @@ (define-public freehdl
,(string-append (assoc-ref inputs "coreutils")
"/bin"))))
(wrap-program (string-append out "/bin/freehdl-config")
`("PKG_CONFIG_PATH" ":" prefix (,(string-append out "/lib/pkgconfig")))))
#t)))))
`("PKG_CONFIG_PATH" ":" prefix
(,(string-append out "/lib/pkgconfig"))))))))))
(inputs
(list coreutils
(list bash-minimal
coreutils
;; Lazily resolve the gcc-toolchain to avoid a circular dependency.
(module-ref (resolve-interface '(gnu packages commencement))
@ -2943,7 +2942,8 @@ (define-public freecad
python-pyside-2-tools
swig))
(inputs
(list boost
(list bash-minimal
boost
coin3d
double-conversion
eigen
@ -3511,16 +3511,18 @@ (define-public solvespace
`("GSETTINGS_SCHEMA_DIR" =
(,(string-append (assoc-ref inputs "gtk+")
"/share/glib-2.0/schemas")))))))))
(inputs (list cairo
eigen
freetype
gtkmm-3
json-c
libpng
libspnav ;spaceware
mimalloc
mesa
zlib))
(inputs
(list bash-minimal
cairo
eigen
freetype
gtkmm-3
json-c
libpng
libspnav ;spaceware
mimalloc
mesa
zlib))
(synopsis
"Parametric 2D/3D @acronym{CAD, computer-aided design} software")
(description
@ -4464,7 +4466,8 @@ (define-public cura
python-pytest
python-requests))
(inputs
(list cura-engine
(list bash-minimal
cura-engine
libcharon
libsavitar
python