diff options
| author | 宋文武 <iyzsong@member.fsf.org> | 2025-02-04 19:43:40 +0800 |
|---|---|---|
| committer | 宋文武 <iyzsong@member.fsf.org> | 2025-02-04 21:41:07 +0800 |
| commit | beb9ad2cf7e83b747781b47cdde2f75a19cd3a1b (patch) | |
| tree | b5a19fc9551a3e2812e5fdde7f6c704fb2b8b6a8 | |
| parent | ac9fc0db767f4ee49acfcc6a0c1b9d1bc6694fe6 (diff) | |
gnu: hurd: Add libpciaccess-static.
This is a followup to 20a8d796f1e8ed3f2ff3344fcf4ab40a45bc3942, 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.
| -rw-r--r-- | gnu/packages/hurd.scm | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 7a7f621e40..1045be31a3 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -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) |