diff options
author | Jason \"Don\" O'Conal <lovek323@gmail.com> | 2013-09-07 10:28:03 +1000 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-09-14 15:19:54 +0200 |
commit | ad454f3511deadfaeaf0f5235b9be2d269e585d4 (patch) | |
tree | 6c56326904f5b94757c919f5903d80a5a4669e65 /pkgs/applications/editors | |
parent | 5bfb4a4f30f110833a5477b43a1a060c2cd04dab (diff) | |
download | nixlib-ad454f3511deadfaeaf0f5235b9be2d269e585d4.tar nixlib-ad454f3511deadfaeaf0f5235b9be2d269e585d4.tar.gz nixlib-ad454f3511deadfaeaf0f5235b9be2d269e585d4.tar.bz2 nixlib-ad454f3511deadfaeaf0f5235b9be2d269e585d4.tar.lz nixlib-ad454f3511deadfaeaf0f5235b9be2d269e585d4.tar.xz nixlib-ad454f3511deadfaeaf0f5235b9be2d269e585d4.tar.zst nixlib-ad454f3511deadfaeaf0f5235b9be2d269e585d4.zip |
emacs24: fix build on darwin (clos #932)
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/emacs-24/default.nix | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index bdb7c2a565a7..ad42cc7cf335 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls -, alsaLib +, alsaLib, cairo , withX ? true }: @@ -14,27 +14,31 @@ stdenv.mkDerivation rec { builder = ./builder.sh; src = fetchurl { - url = "mirror://gnu/emacs/${name}.tar.xz"; + url = "mirror://gnu/emacs/${name}.tar.xz"; sha256 = "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh"; }; buildInputs = [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ] ++ stdenv.lib.optional stdenv.isLinux dbus - ++ stdenv.lib.optionals withX [ - x11 libXaw Xaw3d libXpm libpng libjpeg libungif - libtiff librsvg libXft imagemagick gtk - ]; + ++ stdenv.lib.optionals withX + [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft + imagemagick gtk ] + ++ stdenv.lib.optional stdenv.isDarwin cairo; configureFlags = - (if withX then - [ "--with-x-toolkit=gtk" "--with-xft"] - else - [ "--with-x=no --with-xpm=no --with-jpeg=no --with-png=no --with-gif=no --with-tiff=no" ]) + ( if withX then + [ "--with-x-toolkit=gtk" "--with-xft"] + else + [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" + "--with-gif=no" "--with-tiff=no" ] ) # On NixOS, help Emacs find `crt*.o'. ++ stdenv.lib.optional (stdenv ? glibc) [ "--with-crt-dir=${stdenv.glibc}/lib" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isDarwin && withX) + "-I${cairo}/include/cairo"; + postInstall = '' cat >$out/share/emacs/site-lisp/site-start.el <<EOF ;; nixos specific load-path @@ -45,10 +49,16 @@ stdenv.mkDerivation rec { EOF ''; + + doCheck = true; meta = with stdenv.lib; { description = "GNU Emacs 24, the extensible, customizable text editor"; + homepage = http://www.gnu.org/software/emacs/; + license = licenses.gplv3Plus; + maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny ]; + platforms = platforms.all; longDescription = '' GNU Emacs is an extensible, customizable text editor—and more. At its @@ -66,11 +76,5 @@ EOF extensions are distributed with GNU Emacs; others are available separately. ''; - - homepage = "http://www.gnu.org/software/emacs/"; - license = "GPLv3+"; - - maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny ]; - platforms = platforms.all; }; } |