[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Revert "Revert "gnu: patchelf: Update argument phase.""
From: |
Marius Bakke |
Subject: |
01/01: Revert "Revert "gnu: patchelf: Update argument phase."" |
Date: |
Mon, 19 Mar 2018 19:22:41 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit dbc75dadb54dd0e6b3a125949c26aadfa3bff4ca
Author: Marius Bakke <address@hidden>
Date: Tue Mar 20 00:20:59 2018 +0100
Revert "Revert "gnu: patchelf: Update argument phase.""
This change only affects armhf, which doesn't use PatchELF. My bad!
This reverts commit b1d096f869ed53b84486855d73c7e9070fdf3ae2.
---
gnu/packages/elf.scm | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm
index 253547e..08d9253 100644
--- a/gnu/packages/elf.scm
+++ b/gnu/packages/elf.scm
@@ -128,14 +128,12 @@ Executable and Linkable Format (@dfn{ELF}). This
includes @command{ld},
'()))
(arguments
(if (target-arm32?)
- `(#:phases (alist-cons-after
- 'unpack 'patch/rework-for-arm
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((patch-file
- (assoc-ref inputs "patch/rework-for-arm")))
- (zero? (system* "patch" "--force" "-p1"
- "--input" patch-file))))
- %standard-phases))
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch/rework-for-arm
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((patch-file (assoc-ref inputs "patch/rework-for-arm")))
+ (invoke "patch" "--force" "-p1" "--input" patch-file))))))
'()))
(home-page "https://nixos.org/patchelf.html")