From 9a6a7c9ea0328382e35f8df6d95fbb22e77c2c99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 4 Feb 2025 16:52:06 +0100
Subject: [PATCH] =?UTF-8?q?gnu:=20libpciaccess-static:=20Keep=20in=20same?=
 =?UTF-8?q?=20module=20as=20=E2=80=98libpciaccess=E2=80=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 gnu/packages/hurd.scm | 11 -----------
 gnu/packages/xorg.scm | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 1045be31a38..3b02ed00d1a 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 dc11932b4a0..ffe5e81b8e5 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")