all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: guix-patches--- via <guix-patches@gnu.org>
To: 56657@debbugs.gnu.org
Cc: "Nguyễn Gia Phong" <mcsinyx@disroot.org>
Subject: [bug#56657] [PATCH] gnu: ranger: Add dependency file
Date: Wed, 20 Jul 2022 17:01:43 +0900	[thread overview]
Message-ID: <20220720080143.18005-1-mcsinyx@disroot.org> (raw)

While file is an optional dependency, without it
file type determination and opening does not work out of the box.
---
 gnu/packages/disk.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 47b15e588f79..58bd3db3812c 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -24,6 +24,7 @@
 ;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li>
 ;;; Copyright © 2014, 2022 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2022 Nguyễn Gia Phong <mcsinyx@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -800,7 +801,7 @@ (define-public ranger
                 "0lfjrpv3z4h0knd3v94fijrw2zjba51mrp3mjqx2c98wr428l26f"))))
     (build-system python-build-system)
     (inputs
-     (list w3m))
+     (list file w3m))
     (native-inputs
      (list which
            ;; For tests.
@@ -815,11 +816,13 @@ (define-public ranger
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((out  (assoc-ref outputs "out"))
                     (ranger (string-append out "/bin/ranger"))
+                    (file (assoc-ref inputs "file"))
                     (w3m (assoc-ref inputs "w3m"))
                     (w3mimgdisplay (string-append w3m
                                    "/libexec/w3m/w3mimgdisplay")))
                (wrap-program ranger
-                 `("W3MIMGDISPLAY_PATH" ":" prefix (,w3mimgdisplay)))
+                 `("W3MIMGDISPLAY_PATH" ":" prefix (,w3mimgdisplay))
+                 `("PATH" ":" prefix ,(list (string-append file "/bin"))))
                #t)))
          (replace 'check
            ;; The default check phase simply prints 'Ran 0 tests in 0.000s'.
-- 
2.37.0





             reply	other threads:[~2022-07-20 13:20 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-20  8:01 guix-patches--- via [this message]
2022-07-21  6:50 ` [bug#56657] [PATCH] gnu: ranger: Add dependency file Liliana Marie Prikler
2022-07-26  7:43   ` guix-patches--- via
2022-07-26  7:48     ` Liliana Marie Prikler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220720080143.18005-1-mcsinyx@disroot.org \
    --to=guix-patches@gnu.org \
    --cc=56657@debbugs.gnu.org \
    --cc=mcsinyx@disroot.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.