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

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

Browse source 
It is required for cross-compilation.

* gnu/packages/geo.scm
(grass): Remove input labels and trailing #t.
[inputs]: Add bash-minimal.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Co-authored-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: Ic9d1942098cbfa1d71a81b1f7e0dea352850a4ce
This commit is contained in:
Maxime Devos 2021-07-02 12:06:37 +02:00 committed by Ludovic Courtès
parent 04edfcf7de
commit 94e7684004
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 34 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
gnu/packages/geo.scm
View file

@ -2780,39 +2780,40 @@ (define-public grass
(base32 "1gpfbppfajc8d6b9alw9fdzgaa83w26kl6fff1395bc9gal215ms"))))
(build-system gnu-build-system)
(inputs
`(("bzip2" ,bzip2)
("cairo" ,cairo)
("fftw" ,fftw)
("freetype" ,freetype)
("gdal" ,gdal)
("geos" ,geos)
("glu" ,glu)
("libpng" ,libpng)
("libtiff" ,libtiff)
("mesa" ,mesa)
("mariadb-dev" ,mariadb "dev")
("mariadb-lib" ,mariadb "lib")
("netcdf" ,netcdf)
("openblas" ,openblas)
("perl" ,perl)
("postgresql" ,postgresql)
("proj" ,proj)
("python" ,python)
("python-dateutil" ,python-dateutil)
("python-numpy" ,python-numpy)
("python-wxpython" ,python-wxpython)
("readline" ,readline)
("sqlite" ,sqlite)
("wxwidgets" ,wxwidgets)
("zlib" ,zlib)
("zstd" ,zstd "lib")))
(list bash-minimal
bzip2
cairo
fftw
freetype
gdal
geos
glu
libpng
libtiff
mesa
`(,mariadb "dev")
`(,mariadb "lib")
netcdf
openblas
perl
postgresql
proj
python
python-dateutil
python-numpy
python-wxpython
readline
sqlite
wxwidgets
zlib
`(,zstd "lib")))
(native-inputs
`(("bash" ,bash-minimal)
("bison" ,bison)
("flex" ,flex)
("pkg-config" ,pkg-config)))
(list bash-minimal
bison
flex
pkg-config))
(arguments
`(#:tests? #f ; No tests
`(#:tests? #f ; No tests
#:modules ((guix build gnu-build-system)
((guix build python-build-system) #:prefix python:)
(guix build utils))
@ -2870,16 +2871,14 @@ (define-public grass
(symlink (string-append dir "/include")
(string-append out "/include"))
(symlink (string-append dir "/lib")
(string-append out "/lib")))
#t))
(string-append out "/lib")))))
(add-after 'install-links 'python:wrap
(assoc-ref python:%standard-phases 'wrap))
(add-after 'python:wrap 'wrap-with-python-interpreter
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/" ,grassxx)
`("GRASS_PYTHON" = (,(which "python3"))))
#t))))))
`("GRASS_PYTHON" = (,(which "python3"))))))))))
(synopsis "GRASS Geographic Information System")
(description
"GRASS (Geographic Resources Analysis Support System), is a Geographic