From b1d096f869ed53b84486855d73c7e9070fdf3ae2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 19 Mar 2018 23:46:25 +0100 Subject: [PATCH] Revert "gnu: patchelf: Update argument phase." It causes too many rebuilds this late in the 'staging' cycle. This reverts commit c1d1cd817c7ab8d99e962e286c207943765a8e8f. --- gnu/packages/elf.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 08d92532fa..253547e70f 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -128,12 +128,14 @@ Executable and Linkable Format (@dfn{ELF}). This includes @command{ld}, '())) (arguments (if (target-arm32?) - `(#: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)))))) + `(#: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)) '())) (home-page "https://nixos.org/patchelf.html")