From 8f2be7122c990ec4b44be49412e078c1139b214d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 11 Aug 2015 17:25:46 +0200 Subject: [PATCH] emacs24: style fixups Unused gtk parameter, "incorrect" usage of optional. --- pkgs/applications/editors/emacs-24/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 487fccfa90d..178b2a306af 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -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 =