mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-21 01:26:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: sicp: Fix build.

Browse source 
* gnu/packages/scheme.scm (sicp) [build-system]: Use copy-build-system.
[native-inputs]: Remove source input.
[arguments]: Remove #:modules and #:builder arguments.  Add #:install-plan and
 #:phases arguments.  Patch out obsolete call.
This commit is contained in:
Maxim Cournoyer 2023-04-24 20:58:37 -04:00
parent 941adac603
commit c9f82d57eb
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
gnu/packages/scheme.scm
View file

@ -22,6 +22,7 @@
;;; Copyright © 2022 Robby Zambito <contact@robbyzambito.me>
;;; Copyright © 2023 Andrew Whatson <whatson@tailcall.au>
;;; Copyright © 2023 Juliana Sims <jtsims@protonmail.com>
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -49,6 +50,7 @@ (define-module (gnu packages scheme)
#:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix build-system asdf)
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (gnu packages autotools)
@ -608,7 +610,7 @@ (define-public chibi-scheme
(define-public sicp
(let ((commit "bda03f79d6e2e8899ac2b5ca6a3732210e290a79")
(revision "2"))
(revision "3"))
(package
(name "sicp")
(version (git-version "20180718" revision commit))
@ -621,30 +623,23 @@ (define-public sicp
(base32
"0mng7qrj2dvssyffr9ycnf4a5k0kadp4dslq7mc5bhzq1qxyjs2w"))
(file-name (git-file-name name version))))
(build-system trivial-build-system)
(native-inputs `(("gzip" ,gzip)
("source" ,source)
("texinfo" ,texinfo)))
(build-system copy-build-system)
(native-inputs (list gzip texinfo))
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils)
(srfi srfi-26))
(let ((gzip (assoc-ref %build-inputs "gzip"))
(source (assoc-ref %build-inputs "source"))
(texinfo (assoc-ref %build-inputs "texinfo"))
(html-dir (string-append %output "/share/doc/" ,name "/html"))
(info-dir (string-append %output "/share/info")))
(copy-recursively (string-append source "/html") html-dir)
(setenv "PATH" (string-append gzip "/bin"
":" texinfo "/bin"))
(mkdir-p info-dir)
(invoke "makeinfo" "--output"
(string-append info-dir "/sicp.info")
(string-append source "/sicp-pocket.texi"))
(for-each (cut invoke "gzip" "-9n" <>)
(find-files info-dir))))))
(list #:install-plan ''(("html" "share/doc/sicp/")
("sicp.info" "share/info/"))
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'remove-obsolete-commands
(lambda _
;; Reported upstream:
;; https://github.com/sarabander/sicp/issues/46.
(substitute* "sicp-pocket.texi"
(("@setshortcontentsaftertitlepage")
""))))
(add-before 'install 'build
(lambda _
(invoke "makeinfo" "--output=sicp.info"
"sicp-pocket.texi"))))))
(home-page "https://sarabander.github.io/sicp")
(synopsis "Structure and Interpretation of Computer Programs")
(description "Structure and Interpretation of Computer Programs (SICP) is