diff options
author | Herwig Hochleitner <herwig@bendlas.net> | 2015-05-18 10:39:18 +0200 |
---|---|---|
committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2015-06-07 13:26:27 +0200 |
commit | 8b0b9be025ba5dcc40197c99629e5271b8e0c9ce (patch) | |
tree | 6132d02f010ba46a97b81ed8071a49de0cf5e36d /pkgs | |
parent | f63a9f25340b8f2a0d4beef7d2f5af3544987bac (diff) | |
download | nixlib-8b0b9be025ba5dcc40197c99629e5271b8e0c9ce.tar nixlib-8b0b9be025ba5dcc40197c99629e5271b8e0c9ce.tar.gz nixlib-8b0b9be025ba5dcc40197c99629e5271b8e0c9ce.tar.bz2 nixlib-8b0b9be025ba5dcc40197c99629e5271b8e0c9ce.tar.lz nixlib-8b0b9be025ba5dcc40197c99629e5271b8e0c9ce.tar.xz nixlib-8b0b9be025ba5dcc40197c99629e5271b8e0c9ce.tar.zst nixlib-8b0b9be025ba5dcc40197c99629e5271b8e0c9ce.zip |
emacs24: add options for acl and gpm
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/editors/emacs-24/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 01895647a6b8..e0439f45a9c4 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4efc4f3fdb2f..b49c2e3b59da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10792,6 +10792,8 @@ let gconf = null; alsaLib = null; imagemagick = null; + acl = null; + gpm = null; }; emacs24-nox = lowPrio (appendToName "nox" (emacs24.override { |