public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emacs24: add options for acl and gpm

Browse Source
This commit is contained in:
Herwig Hochleitner 2015-05-18 10:39:18 +02:00 committed by Moritz Ulrich
parent f63a9f2534
commit 8b0b9be025
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/emacs-24/default.nix
View File

@ -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, cairo
, alsaLib, cairo, acl, gpm
, withX ? !stdenv.isDarwin
, withGTK3 ? false, gtk3 ? null
, withGTK2 ? true, gtk2
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
];
buildInputs =
[ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ]
[ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm ]
++ stdenv.lib.optional stdenv.isLinux dbus
++ stdenv.lib.optionals withX
[ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft

2
pkgs/top-level/all-packages.nix
View File

@ -10792,6 +10792,8 @@ let
gconf = null;
alsaLib = null;
imagemagick = null;
acl = null;
gpm = null;
};
emacs24-nox = lowPrio (appendToName "nox" (emacs24.override {