mirror of
https://codeberg.org/guix/guix.git
synced 2026-01-25 12:05:19 -06:00
gnu: hurd: Add libpciaccess-static.
This is a followup to 20a8d796f1, which broke
the Hurd.
* gnu/packages/hurd.scm (libpciaccess-static): New variable.
(hurd, netdde) [inputs]: Replace libpciaccess with libpciaccess-static.
Change-Id: Ifb2cc3d210cf4ce6f4798eac1e9643f1c75ba6fa
Suggested-by: yelninei on IRC.
This commit is contained in:
parent
ac9fc0db76
commit
beb9ad2cf7
1 changed files with 13 additions and 2 deletions
|
|
@ -311,6 +311,17 @@ Hurd-minimal package which are needed for both glibc and GCC.")
|
|||
(define %add-to-hurd-subdirs
|
||||
(list "libmachdevdde" "libddekit"))
|
||||
|
||||
;;; A static libpciaccess is required by hurd and netdde.
|
||||
(define libpciaccess-static
|
||||
(package
|
||||
(inherit libpciaccess)
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments libpciaccess)
|
||||
((#:configure-flags flags)
|
||||
#~(cons "-Ddefault_library=static" #$flags))))
|
||||
(propagated-inputs
|
||||
(list zlib (list zlib "static")))))
|
||||
|
||||
(define-public hurd
|
||||
(package
|
||||
(name "hurd")
|
||||
|
|
@ -572,7 +583,7 @@ exec ${system}/rc \"$@\"
|
|||
`(("libgcrypt" ,libgcrypt) ;for /hurd/random
|
||||
("libdaemon" ,libdaemon) ;for /bin/console --daemonize
|
||||
("unifont" ,unifont)
|
||||
("libpciaccess" ,libpciaccess)
|
||||
("libpciaccess" ,libpciaccess-static)
|
||||
|
||||
;; For NFS support
|
||||
("libtirpc" ,libtirpc/hurd)
|
||||
|
|
@ -700,7 +711,7 @@ implementing them.")
|
|||
(install-file "netdde" hurd)
|
||||
(install-file "netdde.static" hurd)))))))
|
||||
(inputs
|
||||
(list hurd libpciaccess zlib `(,zlib "static")))
|
||||
(list hurd libpciaccess-static zlib `(,zlib "static")))
|
||||
(native-inputs
|
||||
`(("coreutils" ,coreutils)
|
||||
("gawk" ,gawk)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue