unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#28866] [PATCH] gnu: emacs: Fix Man looks for C header files.
@ 2017-10-16 14:47 Oleg Pykhalov
  2017-10-16 15:02 ` Oleg Pykhalov
  0 siblings, 1 reply; 3+ messages in thread
From: Oleg Pykhalov @ 2017-10-16 14:47 UTC (permalink / raw)
  To: 28866

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: [PATCH] gnu: emacs: Fix Man looks for C header files. --]
[-- Type: text/x-patch, Size: 1451 bytes --]

From 73cd8d12b6b7b32d091a948689a732998e9b3f26 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Mon, 16 Oct 2017 17:44:57 +0300
Subject: [PATCH] gnu: emacs: Fix Man looks for C header files.

* gnu/packages/emacs.scm (emacs): Make sure Man looks for C header files in
  the right places.
---
 gnu/packages/emacs.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 315db18a5..c2e6563b4 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -135,7 +135,17 @@
                     (format #f "(tramp-default-remote-path ~s ~s ~s ~s "
                             "~/.guix-profile/bin" "~/.guix-profile/sbin"
                             "/run/current-system/profile/bin"
-                            "/run/current-system/profile/sbin")))))))
+                            "/run/current-system/profile/sbin")))
+
+                 ;; Make sure Man looks for C header files in the right
+                 ;; places.
+                 (substitute* "man.el"
+                   (("\"/usr/local/include\"" line)
+                    (string-join
+                     (list line
+                           "\"/var/guix/profiles/system/profile/include\""
+                           "\"~/.guix-profile/include\"")
+                     " ")))))))
     (build-system glib-or-gtk-build-system)
     (arguments
      `(#:phases
-- 
2.14.2

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

* [bug#28866] [PATCH] gnu: emacs: Fix Man looks for C header files.
  2017-10-16 14:47 [bug#28866] [PATCH] gnu: emacs: Fix Man looks for C header files Oleg Pykhalov
@ 2017-10-16 15:02 ` Oleg Pykhalov
  2017-10-19 10:17   ` bug#28866: " Ludovic Courtès
  0 siblings, 1 reply; 3+ messages in thread
From: Oleg Pykhalov @ 2017-10-16 15:02 UTC (permalink / raw)
  To: bug#28866

[-- Attachment #1: Type: text/plain, Size: 68 bytes --]

This is probably better, because I assume it will search in order.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: [PATCH] gnu: emacs: Fix Man looks for C header files. --]
[-- Type: text/x-patch, Size: 1452 bytes --]

From 83eff5350269f50d89407169eb165e891e65cf11 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Mon, 16 Oct 2017 17:44:57 +0300
Subject: [PATCH] gnu: emacs: Fix Man looks for C header files.

* gnu/packages/emacs.scm (emacs): Make sure Man looks for C header files in
  the right places.
---
 gnu/packages/emacs.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 315db18a5..6d9ea4193 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -135,7 +135,17 @@
                     (format #f "(tramp-default-remote-path ~s ~s ~s ~s "
                             "~/.guix-profile/bin" "~/.guix-profile/sbin"
                             "/run/current-system/profile/bin"
-                            "/run/current-system/profile/sbin")))))))
+                            "/run/current-system/profile/sbin")))
+
+                 ;; Make sure Man looks for C header files in the right
+                 ;; places.
+                 (substitute* "man.el"
+                   (("\"/usr/local/include\"" line)
+                    (string-join
+                     (list line
+                           "\"~/.guix-profile/include\""
+                           "\"/var/guix/profiles/system/profile/include\"")
+                     " ")))))))
     (build-system glib-or-gtk-build-system)
     (arguments
      `(#:phases
-- 
2.14.2


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

* bug#28866: [PATCH] gnu: emacs: Fix Man looks for C header files.
  2017-10-16 15:02 ` Oleg Pykhalov
@ 2017-10-19 10:17   ` Ludovic Courtès
  0 siblings, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2017-10-19 10:17 UTC (permalink / raw)
  To: Oleg Pykhalov; +Cc: bug#28866

Hi Oleg,

Oleg Pykhalov <go.wigust@gmail.com> skribis:

>>From 83eff5350269f50d89407169eb165e891e65cf11 Mon Sep 17 00:00:00 2001
> From: Oleg Pykhalov <go.wigust@gmail.com>
> Date: Mon, 16 Oct 2017 17:44:57 +0300
> Subject: [PATCH] gnu: emacs: Fix Man looks for C header files.
>
> * gnu/packages/emacs.scm (emacs): Make sure Man looks for C header files in
>   the right places.

Applied.

For years I had this in my .emacs:

  (require 'man)
  (setq Man-header-file-path
        `(,(concat (getenv "HOME") "/.guix-profile/include")))

I’m glad we now have a more proper solution.  :-)

Thank you!

Ludo’.

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

end of thread, other threads:[~2017-10-19 10:18 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-16 14:47 [bug#28866] [PATCH] gnu: emacs: Fix Man looks for C header files Oleg Pykhalov
2017-10-16 15:02 ` Oleg Pykhalov
2017-10-19 10:17   ` bug#28866: " 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).