13/35: bootstrap: mes-minimal: Update for mes-0.20.

[guix-commits]

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit c27ae4c0b4f7a5f5bd62a82bff9d051e09fb3506
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Sun Sep 15 19:18:41 2019 +0200

    bootstrap: mes-minimal: Update for mes-0.20.
    
    * gnu/packages/make-bootstrap.scm (%mes-minimal): Update for mes-0.20.
---
 gnu/packages/make-bootstrap.scm | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 217707e..6db88ba 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -660,7 +660,7 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
            #t))))
     (inputs `(("mescc-tools" ,%mescc-tools-static)))))
 
-;; (define-public %mes-minimal-stripped
+;; (define %mes-minimal-stripped
 ;;   ;; A minimal Mes without documentation dependencies, for bootstrap.
 ;;   (let ((triplet "i686-unknown-linux-gnu"))
 ;;     (package
@@ -694,7 +694,7 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
 ;;                            '("bin" "share/mes")))))))))))
 
 ;; Two packages: first build static, bare minimum content.
-(define-public %mes-minimal
+(define %mes-minimal
   ;; A minimal Mes without documentation.
   (let ((triplet "i686-unknown-linux-gnu"))
     (package
@@ -712,15 +712,10 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
            (add-after 'install 'strip-install
              (lambda _
                (let* ((out (assoc-ref %outputs "out"))
+                      (lib (string-append out "/lib"))
                       (share (string-append out "/share")))
-                 (delete-file-recursively (string-append out "/lib/guile"))
-                 (delete-file-recursively (string-append share "/guile"))
-                 (delete-file-recursively (string-append share 
"/mes/scaffold"))
-
-                 (for-each delete-file
-                           (find-files
-                            (string-append share "/mes/lib")
-                            "\\.(h|c)")))))))))))
+                 (delete-file-recursively (string-append lib "/guile"))
+                 (delete-file-recursively (string-append share 
"/guile")))))))))))
 
 ;; next remove store references.
 (define %mes-minimal-stripped