me/guix
Archived
1
0
Fork 0
Code Activity

Revert "gnu: info-reader: Fix cross-compilation."

Browse source 
This reverts commit 614a1e3fa2.
This is broken on master with the following error:

output (`/gnu/store/6rnhfi8zrdajbahbq9ii8bpj7mwfcjba-info-reader-6.6') is not
allowed to refer to path
`/gnu/store/ziinjmbnq004866mwjrczsk12wf35qb8-perl-5.30.0' build of
/gnu/store/nnfvr10713khxp1bkbpwi5wxbj8cm4wb-info-reader-6.6.drv failed View
build log at
'/var/log/guix/drvs/nn/fvr10713khxp1bkbpwi5wxbj8cm4wb-info-reader-6.6.drv.bz2'.
This commit is contained in:
Mathieu Othacehe 2019-12-16 15:08:01 +01:00
parent d0ef3a0048
commit 8c4c5bf86a
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
gnu/packages/texinfo.scm
View file

@ -3,7 +3,6 @@
;;; Copyright © 2014, 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -115,32 +114,32 @@ is on expressing the content semantically, avoiding physical markup commands.")
(inherit texinfo) (inherit texinfo)
(name "info-reader") (name "info-reader")
(arguments (arguments
`(,@(substitute-keyword-arguments (package-arguments texinfo) `(#:disallowed-references ,(assoc-ref (package-inputs texinfo)
((#:phases phases)
`(modify-phases ,phases
(add-after 'install 'keep-only-info-reader
(lambda* (#:key outputs #:allow-other-keys)
;; Remove everything but 'bin/info' and associated
;; files.
(define (files)
(scandir "." (lambda (file)
(not (member file '("." ".."))))))
(let ((out (assoc-ref outputs "out")))
(with-directory-excursion out
(for-each delete-file-recursively
(fold delete (files) '("bin" "share"))))
(with-directory-excursion (string-append out "/bin")
(for-each delete-file (delete "info" (files))))
(with-directory-excursion (string-append out "/share")
(for-each delete-file-recursively
(fold delete (files)
'("info" "locale"))))
#t))))))
#:disallowed-references ,(assoc-ref (package-inputs texinfo)
"perl") "perl")
#:modules ((ice-9 ftw) (srfi srfi-1) #:modules ((ice-9 ftw) (srfi srfi-1)
,@%gnu-build-system-modules))) ,@%gnu-build-system-modules)
#:phases (modify-phases %standard-phases
(add-after 'install 'keep-only-info-reader
(lambda* (#:key outputs #:allow-other-keys)
;; Remove everything but 'bin/info' and associated
;; files.
(define (files)
(scandir "." (lambda (file)
(not (member file '("." ".."))))))
(let ((out (assoc-ref outputs "out")))
(with-directory-excursion out
(for-each delete-file-recursively
(fold delete (files) '("bin" "share"))))
(with-directory-excursion (string-append out "/bin")
(for-each delete-file (delete "info" (files))))
(with-directory-excursion (string-append out "/share")
(for-each delete-file-recursively
(fold delete (files)
'("info" "locale"))))
#t))))))
(synopsis "Standalone Info documentation reader"))) (synopsis "Standalone Info documentation reader")))
(define-public texi2html (define-public texi2html