nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Revert "gnu: patchelf: Update argument phase."" 

This change only affects armhf, which doesn't use PatchELF.  My bad!

This reverts commit b1d096f869.
This commit is contained in:
Marius Bakke 2018-03-20 00:20:59 +01:00
parent 061f204dcd
commit dbc75dadb5
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/elf.scm
View File

@ -128,14 +128,12 @@ Executable and Linkable Format (@dfn{ELF}). This includes @command{ld},
'())) '()))
(arguments (arguments
(if (target-arm32?) (if (target-arm32?)
`(#:phases (alist-cons-after `(#:phases
'unpack 'patch/rework-for-arm (modify-phases %standard-phases
(lambda* (#:key inputs #:allow-other-keys) (add-after 'unpack 'patch/rework-for-arm
(let ((patch-file (lambda* (#:key inputs #:allow-other-keys)
(assoc-ref inputs "patch/rework-for-arm"))) (let ((patch-file (assoc-ref inputs "patch/rework-for-arm")))
(zero? (system* "patch" "--force" "-p1" (invoke "patch" "--force" "-p1" "--input" patch-file))))))
"--input" patch-file))))
%standard-phases))
'())) '()))
(home-page "https://nixos.org/patchelf.html") (home-page "https://nixos.org/patchelf.html")