guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

11/12: gnu: micropython: Don't override 'install-license-files.


From: guix-commits
Subject: 11/12: gnu: micropython: Don't override 'install-license-files.
Date: Sat, 4 Jun 2022 14:31:16 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit 847aa3942b5edea04d56dfb75ad1d88a3e9bb256
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun May 29 02:00:00 2022 +0200

    gnu: micropython: Don't override 'install-license-files.
    
    * gnu/packages/python.scm (micropython)[arguments]: Prefix a new
    'chdir-back phase instead of overriding 'install-license-files.
---
 gnu/packages/python.scm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 1727024bfe..ad475d8acc 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -704,13 +704,10 @@ To function properly, this package should not be 
installed together with the
                    ;; see: https://github.com/micropython/micropython/pull/4246
                    (substitute* "Makefile"
                      (("-Os") "-Os -ffp-contract=off"))))
-               (replace 'install-license-files
+               (add-before 'install-license-files 'chdir-back
                  ;; We don't build in the root directory so the file isn't 
found.
-                 (lambda* (#:key outputs #:allow-other-keys)
-                   (let* ((out  (assoc-ref outputs "out"))
-                          (doc (string-append out "/share/doc/"
-                                              #$name "-" #$version "/")))
-                     (install-file "../../LICENSE" doc))))
+                 (lambda _
+                   (chdir "../..")))
                (delete 'configure))       ; no configure
            #:make-flags
            #~(list (string-append "PREFIX=" #$output)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]