alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

emacs: On Darwin, don't depend on gconf and cairo

Browse source
This commit is contained in:
Eelco Dolstra 2014-08-09 19:00:17 +02:00
parent a7c1541a21
commit 0132e1bb48
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/editors/emacs-24/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d
, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, openssl
, alsaLib, cairo , alsaLib, cairo
, withX ? !stdenv.isDarwin, withGTK ? true , withX ? !stdenv.isDarwin, withGTK ? true
}: }:
@ -21,12 +21,12 @@ stdenv.mkDerivation rec {
patches = [ ./darwin-new-sections.patch ]; patches = [ ./darwin-new-sections.patch ];
buildInputs = buildInputs =
[ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ] [ ncurses gconf libxml2 openssl alsaLib pkgconfig texinfo ]
++ stdenv.lib.optional stdenv.isLinux dbus ++ stdenv.lib.optional stdenv.isLinux dbus
++ stdenv.lib.optionals withX ++ stdenv.lib.optionals withX
[ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
imagemagick gtk ] imagemagick gtk gconf ]
++ stdenv.lib.optional stdenv.isDarwin cairo; ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo;
configureFlags = configureFlags =
( if withX && withGTK then ( if withX && withGTK then