Author: kkallio
Date: Wed Jan 4 05:48:38 2012
New Revision: 31261
URL: https://nixos.org/websvn/nix/?rev=31261&sc=1
Log:
In Emacs site-start.el check that NIX_PROFILES is set.
In the stdenv this is not set, which causes an elisp error
which in turn makes builds depending on Emacs (eg gnuplot) fail.
Modified:
nixpkgs/trunk/pkgs/applications/editors/emacs-22/default.nix
nixpkgs/trunk/pkgs/applications/editors/emacs-23/default.nix
nixpkgs/trunk/pkgs/applications/editors/emacs-snapshot/default.nix
Modified: nixpkgs/trunk/pkgs/applications/editors/emacs-22/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/editors/emacs-22/default.nix Wed Jan
4 00:26:48 2012 (r31260)
+++ nixpkgs/trunk/pkgs/applications/editors/emacs-22/default.nix Wed Jan
4 05:48:38 2012 (r31261)
@@ -33,10 +33,10 @@
postInstall = ''
cat >$out/share/emacs/site-lisp/site-start.el <<EOF
;; nixos specific load-path
-(setq load-path
- (append (reverse (mapcar (lambda (x) (concat x
"/share/emacs/site-lisp/"))
- (split-string (getenv "NIX_PROFILES"))))
- 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)))
EOF
'';
Modified: nixpkgs/trunk/pkgs/applications/editors/emacs-23/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/editors/emacs-23/default.nix Wed Jan
4 00:26:48 2012 (r31260)
+++ nixpkgs/trunk/pkgs/applications/editors/emacs-23/default.nix Wed Jan
4 05:48:38 2012 (r31261)
@@ -34,10 +34,10 @@
postInstall = ''
cat >$out/share/emacs/site-lisp/site-start.el <<EOF
;; nixos specific load-path
-(setq load-path
- (append (reverse (mapcar (lambda (x) (concat x
"/share/emacs/site-lisp/"))
- (split-string (getenv "NIX_PROFILES"))))
- 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)))
EOF
'';
Modified: nixpkgs/trunk/pkgs/applications/editors/emacs-snapshot/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/editors/emacs-snapshot/default.nix Wed Jan
4 00:26:48 2012 (r31260)
+++ nixpkgs/trunk/pkgs/applications/editors/emacs-snapshot/default.nix Wed Jan
4 05:48:38 2012 (r31261)
@@ -51,10 +51,10 @@
postInstall = ''
cat >$out/share/emacs/site-lisp/site-start.el <<EOF
;; nixos specific load-path
-(setq load-path
- (append (reverse (mapcar (lambda (x) (concat x
"/share/emacs/site-lisp/"))
- (split-string (getenv "NIX_PROFILES"))))
- 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)))
EOF
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
