emacs24: style fixups

Unused gtk parameter, "incorrect" usage of optional.
This commit is contained in:
Vladimír Čunát 2015-08-11 17:25:46 +02:00
parent 18b2a21583
commit 8f2be7122c

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d
, pkgconfig, gettext, gtk, libXft, dbus, libpng, libjpeg, libungif
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
, alsaLib, cairo, acl, gpm
, withX ? !stdenv.isDarwin
@ -45,8 +45,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals withX
[ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
imagemagick gconf ]
++ stdenv.lib.optional (withX && withGTK2) [ gtk2 ]
++ stdenv.lib.optional (withX && withGTK3) [ gtk3 ]
++ stdenv.lib.optional (withX && withGTK2) gtk2
++ stdenv.lib.optional (withX && withGTK3) gtk3
++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo;
configureFlags =