me/guix
Archived
1
0
Fork 0
Code Activity

gnu: hwinfo: Rename non-standard ‘dev’ output.

Browse source 
* gnu/packages/hardware.scm (hwinfo)[outputs]: Rename ‘dev’ to ‘lib’.
[arguments]: Ditto.
This commit is contained in:
Tobias Geerinckx-Rice 2022-05-29 02:00:00 +02:00
parent e1be3b947a
commit 81429d680d
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/hardware.scm
View file

@ -141,7 +141,7 @@ sets, and tools to deal with register databases.")
(lambda (port) (lambda (port)
(format port ,version))))))) (format port ,version)))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "dev" "doc")) (outputs '("out" "lib" "doc"))
(arguments (arguments
`(#:tests? #f ; no test-suite available `(#:tests? #f ; no test-suite available
#:phases #:phases
@ -149,10 +149,10 @@ sets, and tools to deal with register databases.")
(add-after 'unpack 'patch (add-after 'unpack 'patch
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(dev (assoc-ref outputs "dev")) (lib (assoc-ref outputs "lib"))
(doc (assoc-ref outputs "doc")) (doc (assoc-ref outputs "doc"))
(incl-dir (string-append dev "/include")) (incl-dir (string-append lib "/include"))
(lib-dir (string-append dev "/lib")) (lib-dir (string-append lib "/lib"))
(sbin-dir (string-append out "/sbin")) (sbin-dir (string-append out "/sbin"))
(share-dir (string-append out "/share")) (share-dir (string-append out "/share"))
(doc-dir (string-append doc "/share/doc"))) (doc-dir (string-append doc "/share/doc")))
@ -172,16 +172,16 @@ sets, and tools to deal with register databases.")
(("/usr/sbin") sbin-dir) (("/usr/sbin") sbin-dir)
(("/usr/share") share-dir) (("/usr/share") share-dir)
(("\\$\\(DESTDIR\\)/sbin ") "")) (("\\$\\(DESTDIR\\)/sbin ") ""))
;; Add output "dev" to the run-path. ;; Add the "lib" output to the run-path.
(substitute* "Makefile.common" (substitute* "Makefile.common"
(("-Lsrc") (("-Lsrc")
(string-append "-Lsrc " "-Wl,-rpath=" lib-dir))) (string-append "-Lsrc " "-Wl,-rpath=" lib-dir)))
;; Correct program name of the lexical analyzer. ;; Correct program name of the lexical analyzer.
(substitute* "src/isdn/cdb/Makefile" (substitute* "src/isdn/cdb/Makefile"
(("lex isdn_cdb.lex") "flex isdn_cdb.lex")) (("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" (substitute* "hwinfo.pc.in"
(("/usr") dev))))) (("/usr") lib)))))
(delete 'configure) (delete 'configure)
(replace 'build (replace 'build
(lambda _ (lambda _