summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2025-02-04 16:52:06 +0100
committerLudovic Courtès <ludo@gnu.org>2025-02-04 16:55:47 +0100
commit9a6a7c9ea0328382e35f8df6d95fbb22e77c2c99 (patch)
tree958a92b95a640c76e79b9fbcbd269d5595e392d2
parent25a67a8d3f6db7493458452b308792d042e94c86 (diff)
gnu: libpciaccess-static: Keep in same module as ‘libpciaccess’.
Fixes a bug introduced in beb9ad2cf7e83b747781b47cdde2f75a19cd3a1b where ‘guix pull’ would fail to build guix-system-tests.drv: gnu/packages/hurd.scm:317:13: error: libpciaccess: unbound variable * gnu/packages/hurd.scm (libpciaccess-static): Move to… * gnu/packages/xorg.scm (libpciaccess-static): … here. Add ‘name’ field. Change-Id: I4ec6a800360e82a5bc28f4e0b6c51772108fc3b1
-rw-r--r--gnu/packages/hurd.scm11
-rw-r--r--gnu/packages/xorg.scm11
2 files changed, 11 insertions, 11 deletions
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 1045be31a3..3b02ed00d1 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -311,17 +311,6 @@ 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")
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index dc11932b4a..ffe5e81b8e 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1206,6 +1206,17 @@ themselves.")
(description "Xorg Generic PCI access library.")
(license license:x11)))
+;;; A static libpciaccess is required by hurd and netdde.
+(define-public libpciaccess-static
+ (package/inherit libpciaccess
+ (name "libpciaccess-static")
+ (arguments
+ (substitute-keyword-arguments (package-arguments libpciaccess)
+ ((#:configure-flags flags)
+ #~(cons "-Ddefault_library=static" #$flags))))
+ (propagated-inputs
+ (list zlib (list zlib "static")))))
+
(define-public libpthread-stubs
(package
(name "libpthread-stubs")