From 96db2ff145ecbd962206eae815b065bda7ed3d9f Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Tue, 7 Sep 2021 15:11:46 +0200
Subject: gnu: racket-minimal: Remove top-level reference to 'chez-scheme'.

This could cause build errors; for instance, doing:

  make && touch gnu/packages/chez.scm && make

would trigger a "chez-scheme: unbound variable" error.

* gnu/packages/racket.scm (racket-minimal)[source]: Add 'modules'
field.  In 'snippet', remove top-level reference to CHEZ-SCHEME, which
could cause build errors.  Simplify snippet.
---
 gnu/packages/racket.scm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'gnu/packages/racket.scm')

diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm
index 4bc34193c6..8349c5032c 100644
--- a/gnu/packages/racket.scm
+++ b/gnu/packages/racket.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2018, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2018, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2021 Philip McGrath <philip@philipmcgrath.com>
@@ -139,17 +139,20 @@
         "061bhiyjlvazph0dj9i3i3x2q5z53rp8h5cjwg3frjimkr45lncn")
        (file-name (git-file-name name version))
        (patches (search-patches "racket-minimal-sh-via-rktio.patch"))
+       (modules '((guix build utils)))
        (snippet
         (with-imported-modules '((guix build utils))
           #~(begin
-              (use-modules (guix build utils))
-              ;; unbundle Chez submodules
+              ;; Unbundle Chez submodules.
               (with-directory-excursion "racket/src/ChezScheme"
-                #$(origin-snippet (package-source chez-scheme)))
-              ;; unbundle libffi
-              (for-each
-               delete-file-recursively
-               '("racket/src/bc/foreign/libffi")))))))
+                ;; Remove bundled libraries (copied from 'chez-scheme').
+                (for-each delete-file-recursively
+                          '("stex"
+                            "nanopass"
+                            "lz4"
+                            "zlib")))
+              ;; Unbundle libffi.
+              (delete-file-recursively "racket/src/bc/foreign/libffi"))))))
     (inputs
      `(;; common to all racket-minimal variants:
        ("openssl" ,openssl)
-- 
cgit v1.2.3