From 02a585212f34a7c6058c40db5a7fed5a4a9b0138 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 19 Sep 2021 19:52:11 +0300 Subject: [PATCH] gnu: newsboat: Fix build. * gnu/packages/syndication.scm (newsboat)[arguments]: Move the prefix declaration to the 'patch-source phase. Adjust other phases so they actually build. --- gnu/packages/syndication.scm | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index ed2fb3ba79..dc577b87f0 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -276,29 +276,21 @@ (define-public newsboat (lambda* (#:key vendor-dir #:allow-other-keys) ;; Don't keep the whole tarball in the vendor directory (delete-file-recursively - (string-append vendor-dir "/" ,name "-" ,version ".tar.xz")) - #t)) + (string-append vendor-dir "/" ,name "-" ,version ".tar.xz")))) (add-after 'unpack 'patch-source - (lambda _ + (lambda* (#:key outputs #:allow-other-keys) (substitute* "Makefile" - (("Cargo.lock") "")) - #t)) + (("Cargo.lock") "") + ;; Replace the prefix in the Makefile. + (("/usr/local") (assoc-ref outputs "out"))))) (replace 'build - (lambda* args - ((assoc-ref gnu:%standard-phases 'build) - #:make-flags - (list (string-append "prefix=" (assoc-ref %outputs "out")))))) + (assoc-ref gnu:%standard-phases 'build)) (replace 'check - (lambda* args + (lambda args ((assoc-ref gnu:%standard-phases 'check) - #:test-target "test" - #:make-flags - (list (string-append "prefix=" (assoc-ref %outputs "out")))))) + #:test-target "test"))) (replace 'install - (lambda* args - ((assoc-ref gnu:%standard-phases 'install) - #:make-flags - (list (string-append "prefix=" (assoc-ref %outputs "out"))))))))) + (assoc-ref gnu:%standard-phases 'install))))) (native-search-paths ;; Newsboat respects CURL_CA_BUNDLE. (package-native-search-paths curl))