~ruther/guix-local

9a6a7c9ea0328382e35f8df6d95fbb22e77c2c99 — Ludovic Courtès 1 year, 1 month ago 25a67a8
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
2 files changed, 11 insertions(+), 11 deletions(-)

M gnu/packages/hurd.scm
M gnu/packages/xorg.scm
M gnu/packages/hurd.scm => gnu/packages/hurd.scm +0 -11
@@ 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")

M gnu/packages/xorg.scm => gnu/packages/xorg.scm +11 -0
@@ 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")