[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: gnu: toybox: Don't install files to usr.
From: |
guix-commits |
Subject: |
01/03: gnu: toybox: Don't install files to usr. |
Date: |
Mon, 17 Jun 2019 03:03:06 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit ee0b4733e1a186048983ac6b6ba0bae23b3f567d
Author: Efraim Flashner <address@hidden>
Date: Sun Jun 16 20:34:13 2019 +0300
gnu: toybox: Don't install files to usr.
* gnu/packages/busybox.scm (toybox)[arguments]: Add custom phase to
remove any files installed in $PREFIX/usr.
---
gnu/packages/busybox.scm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm
index cc6257b..182b8ac 100644
--- a/gnu/packages/busybox.scm
+++ b/gnu/packages/busybox.scm
@@ -1,8 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <address@hidden>
-;;; Copyright © 2016, 2017, 2018 Efraim Flashner <address@hidden>
+;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <address@hidden>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
-;;; Copyright © 2018 Efraim Flashner <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -133,7 +132,12 @@ any small or embedded system.")
(let ((out (assoc-ref outputs "out")))
(invoke "make"
(string-append "PREFIX=" out)
- "install")))))
+ "install"))))
+ (add-after 'install 'remove-usr-directory
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (delete-file-recursively (string-append out "/usr"))
+ #t))))
#:test-target "tests"))
(native-inputs `(("bc" ,bc)))
(synopsis "Many common UNIX utilities in a single executable")