me/guix
Archived
1
0
Fork 0
Code Activity

plan9port: Install into "$output/plan9" instead of "$output".

Browse source 
This fixes <https://issues.guix.gnu.org/67329>.

* gnu/packages/plan9.scm (plan9port)[arguments]: Add 'strip-directories'.
<phases>: Use "$output/plan9" as PLAN9_TARGET.  Remove 'wrap-executables
phase, instead invoke "./INSTALL -c" to change hard-coded /usr/local/plan9
paths.

Change-Id: I7e24f64445c9b6cdcc0d803239e10b226931a845
This commit is contained in:
宋文武 2023-12-31 17:15:57 +08:00
parent e661c1f31d
commit 2538a773c5
No known key found for this signature in database
GPG key ID: D415BF253B515976
1 changed files with 63 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gnu/packages/plan9.scm
View file

@ -94,20 +94,23 @@ reconstruct a Plan 9 terminal-like experience from a non-Plan 9 system.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:tests? #f ;no tests (list #:tests? #f ;no tests
#:phases #~(modify-phases %standard-phases #:strip-directories #~'("plan9/bin")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'setup (add-after 'unpack 'setup
(lambda _ (lambda _
(let ((dest (string-append #$output "/plan9")))
(delete-file "src/cmd/mk/mk.pdf") (delete-file "src/cmd/mk/mk.pdf")
(substitute* "src/cmd/acme/acme.c" (substitute* "src/cmd/acme/acme.c"
(("/lib/font/bit/lucsans/euro.8.font") (("/lib/font/bit/lucsans/euro.8.font")
(string-append #$output (string-append dest
"/font/fixed/unicode.5x8.font")) "/font/fixed/unicode.5x8.font"))
(("/lib/font/bit/lucm/unicode.9.font") (("/lib/font/bit/lucm/unicode.9.font")
(string-append #$output (string-append dest
"/font/fixed/unicode.6x9.font"))) "/font/fixed/unicode.6x9.font")))
(substitute* (find-files "src") (substitute* (find-files "src")
(("/lib/font/bit") (("/lib/font/bit")
(string-append #$output "/font"))) (string-append dest "/font")))
(substitute* "bin/9c" (substitute* "bin/9c"
(("which") (("which")
(which "which"))) (which "which")))
@ -120,21 +123,19 @@ reconstruct a Plan 9 terminal-like experience from a non-Plan 9 system.")
(lambda _ (lambda _
(format #t "CC9=~a~%" #$(cc-for-target)) (format #t "CC9=~a~%" #$(cc-for-target))
(format #t "FONTSRV=fontsrv~%"))) (format #t "FONTSRV=fontsrv~%")))
(setenv "X11" (setenv "X11" #$libx11)
#$libx11) (setenv "PLAN9" (getcwd))
(setenv "PLAN9" (setenv "PLAN9_TARGET" dest))))
(getcwd))
(setenv "PLAN9_TARGET"
#$output)))
(delete 'configure) ;no configure (delete 'configure) ;no configure
(replace 'build (replace 'build
(lambda _ (lambda _
(invoke "./INSTALL" "-b"))) (invoke "./INSTALL" "-b")))
(replace 'install (replace 'install
(lambda _ (lambda _
(invoke "./INSTALL" "-c")
(let ((dest (getenv "PLAN9_TARGET")))
(for-each (lambda (x) (for-each (lambda (x)
(let ((out (string-append #$output (let ((out (string-append dest "/" x)))
"/" x)))
(mkdir-p out) (mkdir-p out)
(copy-recursively x out))) (copy-recursively x out)))
;; TODO: use external sky and dict packages ;; TODO: use external sky and dict packages
@ -150,15 +151,10 @@ reconstruct a Plan 9 terminal-like experience from a non-Plan 9 system.")
"tmac" "tmac"
"troff" "troff"
"postscript")) "postscript"))
(install-file "rcmain" #$output))) (install-file "rcmain" dest)
(add-after 'install 'wrap-executables (mkdir-p (string-append #$output "/bin"))
(lambda _ (symlink (string-append dest "/bin/9")
(for-each (lambda (exe) (string-append #$output "/bin/9")))))
(wrap-program exe
`("PLAN9" ":" prefix
(,#$output))))
(find-files
(string-append #$output "/bin")))))
;; Plan9 doesn't compress man pages ;; Plan9 doesn't compress man pages
(delete 'compress-documentation)))) (delete 'compress-documentation))))
(native-inputs (list perl which)) (native-inputs (list perl which))