unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* Partial fix for bug 25273
@ 2016-12-26 14:55 ng0
  2016-12-26 14:55 ` [PATCH] gnu: mc: Partially fix absolute file paths ng0
  0 siblings, 1 reply; 3+ messages in thread
From: ng0 @ 2016-12-26 14:55 UTC (permalink / raw)
  To: guix-devel

Added a phase to substitute some paths.
To move forward with the rest of the bug I need input on the questions asked in the bug report thread, this as a first review.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] gnu: mc: Partially fix absolute file paths.
  2016-12-26 14:55 Partial fix for bug 25273 ng0
@ 2016-12-26 14:55 ` ng0
  2016-12-31  0:23   ` Ludovic Courtès
  0 siblings, 1 reply; 3+ messages in thread
From: ng0 @ 2016-12-26 14:55 UTC (permalink / raw)
  To: guix-devel

Partially fixes <http://bugs.gnu.org/25273>.

* gnu/packages/mc.scm (mc)[arguments]: Add new phase 'fix-absolutism.
This substitutes absolute file paths with functional file paths.
---
 gnu/packages/mc.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/mc.scm b/gnu/packages/mc.scm
index 43dab8ff4..ad954bdfd 100644
--- a/gnu/packages/mc.scm
+++ b/gnu/packages/mc.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 ng0 <ng0@libertad.pw>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -53,7 +54,17 @@
               ("check" ,check)))
     (arguments
      `(#:configure-flags
-       '("--with-screen=ncurses" "--enable-aspell")))
+       '("--with-screen=ncurses" "--enable-aspell")
+       #:phases
+       (modify-phases %standard-phases
+         ;; We need to modify certain files which keep absolute paths
+         (add-after 'patch-source-shebangs 'fix-absolutism
+           (lambda _
+             (substitute* "misc/mcedit.menu.in"
+               (("#! /bin/sh") (string-append "#!" (which "sh")))
+               (("/bin/bash") (which "bash")))
+             (substitute* "misc/ext.d/misc.sh.in"
+               (("/bin/cat") "cat")))))))
     (home-page "http://www.midnight-commander.org")
     (synopsis "Graphical file manager")
     (description
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] gnu: mc: Partially fix absolute file paths.
  2016-12-26 14:55 ` [PATCH] gnu: mc: Partially fix absolute file paths ng0
@ 2016-12-31  0:23   ` Ludovic Courtès
  0 siblings, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2016-12-31  0:23 UTC (permalink / raw)
  To: ng0; +Cc: guix-devel

ng0 <ng0@libertad.pw> skribis:

> Partially fixes <http://bugs.gnu.org/25273>.
>
> * gnu/packages/mc.scm (mc)[arguments]: Add new phase 'fix-absolutism.
> This substitutes absolute file paths with functional file paths.

[...]

> +       (modify-phases %standard-phases
> +         ;; We need to modify certain files which keep absolute paths
> +         (add-after 'patch-source-shebangs 'fix-absolutism
> +           (lambda _
> +             (substitute* "misc/mcedit.menu.in"
> +               (("#! /bin/sh") (string-append "#!" (which "sh")))
> +               (("/bin/bash") (which "bash")))
> +             (substitute* "misc/ext.d/misc.sh.in"
> +               (("/bin/cat") "cat")))))))

Committed; I moved the comment below ‘lambda’ and added #t at the end of
lambda.

Thanks!

Ludo’.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-12-31  0:23 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-26 14:55 Partial fix for bug 25273 ng0
2016-12-26 14:55 ` [PATCH] gnu: mc: Partially fix absolute file paths ng0
2016-12-31  0:23   ` Ludovic Courtès

Code repositories for project(s) associated with this public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).