diff options
author | John Wiegley <johnw@newartisans.com> | 2014-08-10 23:18:57 -0500 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2014-08-10 23:18:57 -0500 |
commit | 326ca0f6900142b138512e3b2528b8bad39750d5 (patch) | |
tree | a7337d98671e8124a3d5f7ea86d0ba71ebf6a93c /pkgs/applications/editors/emacs-24 | |
parent | b9bd655b16a4a0c6886f9b4dc0d038a0462105f2 (diff) |
Many minor fixes to get things building after recent compiler changes
Diffstat (limited to 'pkgs/applications/editors/emacs-24')
-rw-r--r-- | pkgs/applications/editors/emacs-24/macport.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/applications/editors/emacs-24/macport.nix b/pkgs/applications/editors/emacs-24/macport.nix index 4c599916d9478..d9b32351040b7 100644 --- a/pkgs/applications/editors/emacs-24/macport.nix +++ b/pkgs/applications/editors/emacs-24/macport.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "194y341zrpjp75mc3099kjc0inr1d379wwsnav257bwsc967h8yx"; }; + patches = [ ./darwin-new-sections.patch ]; + buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ]; postUnpack = '' @@ -53,16 +55,13 @@ stdenv.mkDerivation rec { 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/")) + (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")) + (eval-after-load 'tramp '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin")) EOF ''; |