guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

06/09: gnu: i3status-rust: Fix build.


From: guix-commits
Subject: 06/09: gnu: i3status-rust: Fix build.
Date: Sat, 18 Dec 2021 18:49:27 -0500 (EST)

nckx pushed a commit to branch master
in repository guix.

commit 2f5f658d70c54dc8aec66118d514bedfb570af24
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Dec 19 00:35:33 2021 +0100

    gnu: i3status-rust: Fix build.
    
    * gnu/packages/rust-apps.scm (i3status-rust)[arguments]: Actually use
    the requested OUTPUTS phase keywords instead of the obsolete %OUTPUTS.
    
    Reported by vldn[m] on #guix.
---
 gnu/packages/rust-apps.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 6d4f77a..e9bd4eb 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -575,12 +575,14 @@ characters, ASCII whitespace characters, other ASCII 
characters and non-ASCII.")
              (setenv "RUSTC_BOOTSTRAP" "1")))
          (add-after 'unpack 'fix-resources-path
            (lambda* (#:key outputs #:allow-other-keys)
-             (let ((resources (string-append %output "/share")))
+             (let* ((out (assoc-ref outputs "out"))
+                    (share (string-append out "/share")))
                (substitute* "src/util.rs"
-                 (("/usr/share/i3status-rust") resources)))))
+                 (("/usr/share/i3status-rust") share)))))
          (add-after 'install 'install-resources
            (lambda* (#:key outputs #:allow-other-keys)
-             (copy-recursively "files" (string-append %output "/share"))))
+             (let ((out (assoc-ref outputs "out")))
+               (copy-recursively "files" (string-append out "/share")))))
          (add-after 'install 'wrap-i3status
            (lambda* (#:key outputs inputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out"))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]