public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In Emacs site-start.el check that NIX_PROFILES is set.

Browse Source 
In the stdenv this is not set, which causes an elisp error
which in turn makes builds depending on Emacs (eg gnuplot) fail.

svn path=/nixpkgs/trunk/; revision=31261
This commit is contained in:
Karn Kallio 2012-01-04 05:48:38 +00:00
parent 0e1ea067ab
commit ec8e23cc97
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/editors/emacs-22/default.nix
View File

@ -33,10 +33,10 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
cat >$out/share/emacs/site-lisp/site-start.el <<EOF cat >$out/share/emacs/site-lisp/site-start.el <<EOF
;; nixos specific load-path ;; nixos specific load-path
(setq load-path (when (getenv "NIX_PROFILES") (setq load-path
(append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
(split-string (getenv "NIX_PROFILES")))) (split-string (getenv "NIX_PROFILES"))))
load-path)) load-path)))
EOF EOF
''; '';

8
pkgs/applications/editors/emacs-23/default.nix
View File

@ -34,10 +34,10 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
cat >$out/share/emacs/site-lisp/site-start.el <<EOF cat >$out/share/emacs/site-lisp/site-start.el <<EOF
;; nixos specific load-path ;; nixos specific load-path
(setq load-path (when (getenv "NIX_PROFILES") (setq load-path
(append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
(split-string (getenv "NIX_PROFILES")))) (split-string (getenv "NIX_PROFILES"))))
load-path)) load-path)))
EOF EOF
''; '';

8
pkgs/applications/editors/emacs-snapshot/default.nix
View File

@ -51,10 +51,10 @@ stdenv.mkDerivation {
postInstall = '' postInstall = ''
cat >$out/share/emacs/site-lisp/site-start.el <<EOF cat >$out/share/emacs/site-lisp/site-start.el <<EOF
;; nixos specific load-path ;; nixos specific load-path
(setq load-path (when (getenv "NIX_PROFILES") (setq load-path
(append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
(split-string (getenv "NIX_PROFILES")))) (split-string (getenv "NIX_PROFILES"))))
load-path)) load-path)))
EOF EOF
''; '';