[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/09: gnu: hwinfo: Rename non-standard ‘dev’ output.
From: |
guix-commits |
Subject: |
08/09: gnu: hwinfo: Rename non-standard ‘dev’ output. |
Date: |
Wed, 1 Jun 2022 19:38:32 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 81429d680da5c447d90bcd8d98596d149cf71789
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun May 29 02:00:00 2022 +0200
gnu: hwinfo: Rename non-standard ‘dev’ output.
* gnu/packages/hardware.scm (hwinfo)[outputs]: Rename ‘dev’ to ‘lib’.
[arguments]: Ditto.
---
gnu/packages/hardware.scm | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 03a8df7174..b6d31d9485 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -141,7 +141,7 @@ sets, and tools to deal with register databases.")
(lambda (port)
(format port ,version)))))))
(build-system gnu-build-system)
- (outputs '("out" "dev" "doc"))
+ (outputs '("out" "lib" "doc"))
(arguments
`(#:tests? #f ; no test-suite available
#:phases
@@ -149,10 +149,10 @@ sets, and tools to deal with register databases.")
(add-after 'unpack 'patch
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- (dev (assoc-ref outputs "dev"))
+ (lib (assoc-ref outputs "lib"))
(doc (assoc-ref outputs "doc"))
- (incl-dir (string-append dev "/include"))
- (lib-dir (string-append dev "/lib"))
+ (incl-dir (string-append lib "/include"))
+ (lib-dir (string-append lib "/lib"))
(sbin-dir (string-append out "/sbin"))
(share-dir (string-append out "/share"))
(doc-dir (string-append doc "/share/doc")))
@@ -172,16 +172,16 @@ sets, and tools to deal with register databases.")
(("/usr/sbin") sbin-dir)
(("/usr/share") share-dir)
(("\\$\\(DESTDIR\\)/sbin ") ""))
- ;; Add output "dev" to the run-path.
+ ;; Add the "lib" output to the run-path.
(substitute* "Makefile.common"
(("-Lsrc")
(string-append "-Lsrc " "-Wl,-rpath=" lib-dir)))
;; Correct program name of the lexical analyzer.
(substitute* "src/isdn/cdb/Makefile"
(("lex isdn_cdb.lex") "flex isdn_cdb.lex"))
- ;; Patch pkgconfig file to point to output "dev".
+ ;; Patch pkg-config file to point to the "lib" output.
(substitute* "hwinfo.pc.in"
- (("/usr") dev)))))
+ (("/usr") lib)))))
(delete 'configure)
(replace 'build
(lambda _
- branch master updated (582b4bb4ce -> 0815da693f), guix-commits, 2022/06/01
- 03/09: gnu: ddcutil: Update to 1.2.2., guix-commits, 2022/06/01
- 02/09: gnu: hexedit: Update to 1.6., guix-commits, 2022/06/01
- 04/09: gnu: ddcui: Update to 0.2.1., guix-commits, 2022/06/01
- 07/09: gnu: hwinfo: Update to 21.81., guix-commits, 2022/06/01
- 08/09: gnu: hwinfo: Rename non-standard ‘dev’ output.,
guix-commits <=
- 09/09: gnu: libostree: Update to 2022.3., guix-commits, 2022/06/01
- 01/09: gnu: daemonize: Use HTTPS home page., guix-commits, 2022/06/01
- 06/09: gnu: jpegoptim: Remove input labels., guix-commits, 2022/06/01
- 05/09: gnu: jpegoptim: Update to 1.4.7., guix-commits, 2022/06/01