me
/
guix
Archived
1
0
Fork 0
Code

gnu: imake: Remove input labels. 

* gnu/packages/xorg.scm (imake)[inputs]: Remove input labels.
[arguments]: Gexp accordingly.
master
Tobias Geerinckx-Rice 2021-12-17 21:48:59 +01:00
parent fd290a81fc
commit b4ee524e5a
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gnu/packages/xorg.scm
View File

@ -49,6 +49,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages xorg) (define-module (gnu packages xorg)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
@ -152,31 +153,29 @@
(base32 "00m7l90ws72k1qm101sd2rx92ckd50cszyng5d4dd77jncbf9lmq")))) (base32 "00m7l90ws72k1qm101sd2rx92ckd50cszyng5d4dd77jncbf9lmq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(inputs (inputs
`(("xorg-cf-files" ,xorg-cf-files) (list xorg-cf-files xorgproto))
("xorgproto" ,xorgproto)))
(arguments (arguments
`(#:phases (list #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'install 'install-data (add-after 'install 'install-data
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((cf-files (assoc-ref inputs "xorg-cf-files")) (let ((out (assoc-ref outputs "out"))
(out (assoc-ref outputs "out")) (unpack (assoc-ref %standard-phases 'unpack))
(unpack (assoc-ref %standard-phases 'unpack)) (patch-source-shebangs
(patch-source-shebangs (assoc-ref %standard-phases 'patch-source-shebangs)))
(assoc-ref %standard-phases 'patch-source-shebangs))) (mkdir "xorg-cf-files")
(mkdir "xorg-cf-files") (with-directory-excursion "xorg-cf-files"
(with-directory-excursion "xorg-cf-files" (unpack #:source #$xorg-cf-files)
(apply unpack (list #:source cf-files)) (patch-source-shebangs #:source #$xorg-cf-files)
(apply patch-source-shebangs (list #:source cf-files)) (substitute* '("mingw.cf" "Imake.tmpl" "nto.cf" "os2.cf"
(substitute* '("mingw.cf" "Imake.tmpl" "nto.cf" "os2.cf" "linux.cf" "Amoeba.cf" "cygwin.cf")
"linux.cf" "Amoeba.cf" "cygwin.cf") (("/bin/sh") (which "bash")))
(("/bin/sh") (which "bash"))) (invoke "./configure"
(invoke "./configure" (string-append "SHELL=" (which "bash"))
(string-append "SHELL=" (which "bash")) (string-append "--prefix=" out))
(string-append "--prefix=" out)) (invoke "make" "install"))))))))
(invoke "make" "install"))))))))
(home-page "https://www.x.org/") (home-page "https://www.x.org/")
(synopsis "Source code configuration and build system") (synopsis "Source code configuration and build system")
(description (description