[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)
- branch master updated (28274a353d -> 5754b52abc), guix-commits, 2022/06/04
- 03/12: gnu: jags: Update to 4.3.1., guix-commits, 2022/06/04
- 04/12: gnu: ding-libs: Build from Git., guix-commits, 2022/06/04
- 02/12: gnu: Add iso-codes variant for use within Guix., guix-commits, 2022/06/04
- 06/12: gnu: rcm: Update to 1.3.5., guix-commits, 2022/06/04
- 10/12: gnu: micropython: Use G-expressions., guix-commits, 2022/06/04
- 08/12: gnu: micropython: Update to 1.18., guix-commits, 2022/06/04
- 11/12: gnu: micropython: Don't override 'install-license-files.,
guix-commits <=
- 05/12: gnu: ding-libs: Update to 0.6.2., guix-commits, 2022/06/04
- 07/12: gnu: ding-libs: Omit static library., guix-commits, 2022/06/04
- 01/12: gnu: ceph: Update to 16.2.9., guix-commits, 2022/06/04
- 09/12: gnu: micropython: Remove input labels., guix-commits, 2022/06/04
- 12/12: gnu: papi: Update to 6.0.0.1., guix-commits, 2022/06/04