From 86bd15237863a81a916a37019b592fccda7b0eeb Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sat, 7 Mar 2015 12:03:26 +0100
Subject: [PATCH] Emacs: Fix `woman'.

---
 pkgs/applications/editors/emacs-24/default.nix  | 12 ++----------
 .../applications/editors/emacs-24/site-start.el | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/applications/editors/emacs-24/site-start.el

diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index 71b98eec0e9..af5c11e69ae 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -44,16 +44,8 @@ stdenv.mkDerivation rec {
     "-I${cairo}/include/cairo";
 
   postInstall = ''
-    cat >$out/share/emacs/site-lisp/site-start.el <<EOF
-    ;; nixos specific load-path
-    (when (getenv "NIX_PROFILES") (setq load-path
-                          (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
-                                                   (split-string (getenv "NIX_PROFILES"))))
-                           load-path)))
-        
-    ;; make tramp work for NixOS machines
-    (eval-after-load 'tramp '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin"))
-    EOF
+    mkdir -p $out/share/emacs/site-lisp/
+    cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el
   '';
 
   doCheck = true;
diff --git a/pkgs/applications/editors/emacs-24/site-start.el b/pkgs/applications/editors/emacs-24/site-start.el
new file mode 100644
index 00000000000..023d6412ed8
--- /dev/null
+++ b/pkgs/applications/editors/emacs-24/site-start.el
@@ -0,0 +1,17 @@
+;; NixOS specific load-path
+(setq load-path
+      (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
+                               (split-string (or (getenv "NIX_PROFILES") ""))))
+              load-path))
+
+;;; Make `woman' find the man pages
+(eval-after-load 'woman
+  '(setq woman-manpath
+         (append (reverse (mapcar (lambda (x) (concat x "/share/man/"))
+                                  (split-string (or (getenv "NIX_PROFILES") ""))))
+                 woman-manpath)))
+
+;; Make tramp work for remote NixOS machines
+;;; NOTE: You might want to add 
+(eval-after-load 'tramp
+  '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin"))