diff options
| author | Karn Kallio <tierpluspluslists@gmail.com> | 2012-01-04 05:48:38 +0000 |
|---|---|---|
| committer | Karn Kallio <tierpluspluslists@gmail.com> | 2012-01-04 05:48:38 +0000 |
| commit | ec8e23cc9777a46a095314bb4c02a669db31f9b5 (patch) | |
| tree | 19f6cadcb79af73484f9a7a5d8bb13c92bee1a6d /pkgs/applications | |
| parent | 0e1ea067abb9f20aaac4cbe6411d53f8e0fa29c0 (diff) | |
| download | nixlib-ec8e23cc9777a46a095314bb4c02a669db31f9b5.tar nixlib-ec8e23cc9777a46a095314bb4c02a669db31f9b5.tar.gz nixlib-ec8e23cc9777a46a095314bb4c02a669db31f9b5.tar.bz2 nixlib-ec8e23cc9777a46a095314bb4c02a669db31f9b5.tar.lz nixlib-ec8e23cc9777a46a095314bb4c02a669db31f9b5.tar.xz nixlib-ec8e23cc9777a46a095314bb4c02a669db31f9b5.tar.zst nixlib-ec8e23cc9777a46a095314bb4c02a669db31f9b5.zip | |
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. svn path=/nixpkgs/trunk/; revision=31261
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/editors/emacs-22/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs-23/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs-snapshot/default.nix | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/applications/editors/emacs-22/default.nix b/pkgs/applications/editors/emacs-22/default.nix index c6b1fcaa987e..4a8369170adf 100644 --- a/pkgs/applications/editors/emacs-22/default.nix +++ b/pkgs/applications/editors/emacs-22/default.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { 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 ''; diff --git a/pkgs/applications/editors/emacs-23/default.nix b/pkgs/applications/editors/emacs-23/default.nix index cc841a9bd12c..84a98182e9f5 100644 --- a/pkgs/applications/editors/emacs-23/default.nix +++ b/pkgs/applications/editors/emacs-23/default.nix @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { 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 ''; diff --git a/pkgs/applications/editors/emacs-snapshot/default.nix b/pkgs/applications/editors/emacs-snapshot/default.nix index 06d8e09d5b17..1ae864336e58 100644 --- a/pkgs/applications/editors/emacs-snapshot/default.nix +++ b/pkgs/applications/editors/emacs-snapshot/default.nix @@ -51,10 +51,10 @@ stdenv.mkDerivation { 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 ''; |