diff options
| author | Shea Levy <shea@shealevy.com> | 2015-08-20 08:37:04 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-08-20 08:37:04 -0400 |
| commit | 3506c0bf04538c4a25b57dd43600b61907796008 (patch) | |
| tree | e5d36085c8e345c1f903b7ef1c66be04aaa9e94c /pkgs/applications/editors/emacs-24 | |
| parent | b661ebe3cbef28e81ea70f42cc6ea6af16a30144 (diff) | |
| download | nixlib-3506c0bf04538c4a25b57dd43600b61907796008.tar nixlib-3506c0bf04538c4a25b57dd43600b61907796008.tar.gz nixlib-3506c0bf04538c4a25b57dd43600b61907796008.tar.bz2 nixlib-3506c0bf04538c4a25b57dd43600b61907796008.tar.lz nixlib-3506c0bf04538c4a25b57dd43600b61907796008.tar.xz nixlib-3506c0bf04538c4a25b57dd43600b61907796008.tar.zst nixlib-3506c0bf04538c4a25b57dd43600b61907796008.zip | |
emacs: Build cocoa on darwin
Diffstat (limited to 'pkgs/applications/editors/emacs-24')
| -rw-r--r-- | pkgs/applications/editors/emacs-24/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 178b2a306af1..6c52a8991089 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -50,7 +50,9 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo; configureFlags = - if withX + if stdenv.isDarwin + then [ "--with-ns" "--disable-ns-self-contained" ] + else if withX then [ "--with-x-toolkit=${toolkit}" "--with-xft" ] else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" "--with-gif=no" "--with-tiff=no" ]; @@ -61,6 +63,9 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/share/emacs/site-lisp/ cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el + '' + stdenv.lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv nextstep/Emacs.app $out/Applications ''; doCheck = true; |