diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-09 19:00:17 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-09 19:08:37 +0200 |
| commit | 0132e1bb480a30553a7068e09829caf7443bb37c (patch) | |
| tree | ce060d599dab54420b6f80c99d422c4b049fca6e /pkgs/applications/editors | |
| parent | a7c1541a214591999403654f083d8fb85ada38b4 (diff) | |
| download | nixlib-0132e1bb480a30553a7068e09829caf7443bb37c.tar nixlib-0132e1bb480a30553a7068e09829caf7443bb37c.tar.gz nixlib-0132e1bb480a30553a7068e09829caf7443bb37c.tar.bz2 nixlib-0132e1bb480a30553a7068e09829caf7443bb37c.tar.lz nixlib-0132e1bb480a30553a7068e09829caf7443bb37c.tar.xz nixlib-0132e1bb480a30553a7068e09829caf7443bb37c.tar.zst nixlib-0132e1bb480a30553a7068e09829caf7443bb37c.zip | |
emacs: On Darwin, don't depend on gconf and cairo
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/emacs-24/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 2df240beb944..329fa3a5626e 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif -, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls +, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, openssl , alsaLib, cairo , withX ? !stdenv.isDarwin, withGTK ? true }: @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { patches = [ ./darwin-new-sections.patch ]; buildInputs = - [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ] + [ ncurses gconf libxml2 openssl 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.optional stdenv.isDarwin cairo; + imagemagick gtk gconf ] + ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo; configureFlags = ( if withX && withGTK then |