aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-03-20 00:20:59 +0100
committerMarius Bakke <mbakke@fastmail.com>2018-03-20 00:20:59 +0100
commitdbc75dadb54dd0e6b3a125949c26aadfa3bff4ca (patch)
tree693e7ec783b4bdef7cdeb2fceb99a246ff48d04e /gnu/packages
parent061f204dcd9d003a45026baff4bd1492306029d0 (diff)
downloadguix-dbc75dadb54dd0e6b3a125949c26aadfa3bff4ca.tar
guix-dbc75dadb54dd0e6b3a125949c26aadfa3bff4ca.tar.gz
Revert "Revert "gnu: patchelf: Update argument phase.""
This change only affects armhf, which doesn't use PatchELF. My bad! This reverts commit b1d096f869ed53b84486855d73c7e9070fdf3ae2.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/elf.scm14
1 files changed, 6 insertions, 8 deletions
diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm
index 253547e70f..08d92532fa 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")