From dbc75dadb54dd0e6b3a125949c26aadfa3bff4ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Mar 2018 00:20:59 +0100 Subject: 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 253547e70f..08d92532fa 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -128,14 +128,12 @@ (define-public patchelf '())) (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") -- cgit v1.2.3