amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system/haskell: Add 'extra-directories' keyword.

Browse source 
See <https://bugs.gnu.org/39309>.

* guix/build-system/haskell.scm (lower): Include the transitive
propagated inputs of 'extra-directories' inputs.
(haskell-build): Add the 'extra-directories' keyword and pass it through
to the builder.
* guix/build/haskell-build-system.scm (configure): Use it to select
which inputs get passed via 'extra-include-dirs' and 'extra-lib-dirs' to
Cabal.
* gnu/packages/haskell-xyz.scm (ghc-alsa-core, ghc-hmatrix,
ghc-hmatrix-gsl, ghc-hslua, ghc-iwlib, ghc-libyaml, ghc-ncurses,
ghc-openglraw, ghc-x11, ghc-x11-xft, ghc-zlib): Set 'extra-directories'.
* gnu/packages/haskell-crypto.scm (ghc-digest, ghc-hsopenssl): Likewise.
This commit is contained in:
Timothy Sample 2020-08-08 16:36:35 -04:00 • committed by Ricardo Wurmus
parent 3f7922cbf5
commit 54a5fd0791
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
4 changed files with 47 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/haskell-crypto.scm
View file

@ -343,6 +343,8 @@ generators, and more.")
(base32
"04gy2zp8yzvv7j9bdfvmfzcz3sqyqa6rwslqcn4vyair2vmif5v4"))))
(build-system haskell-build-system)
(arguments
`(#:extra-directories ("zlib")))
(inputs
`(("zlib" ,zlib)))
(home-page
@ -790,6 +792,8 @@ extensions.")
(base32
"0qivl9clmybfglwxqp2sq308rv4ia4rhwshcsc8b029bvpp0mpsi"))))
(build-system haskell-build-system)
(arguments
`(#:extra-directories ("openssl")))
(inputs
`(("ghc-network" ,ghc-network)
("openssl" ,openssl)))