Author: chaoflow
Date: Mon Jan 23 00:55:48 2012
New Revision: 31788
URL: https://nixos.org/websvn/nix/?rev=31788&sc=1
Log:
emacs-24 alsaLib and imagemagickBig
Modified:
nixpkgs/trunk/pkgs/applications/editors/emacs-24/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/editors/emacs-24/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/editors/emacs-24/default.nix Sun Jan
22 10:52:09 2012 (r31787)
+++ nixpkgs/trunk/pkgs/applications/editors/emacs-24/default.nix Mon Jan
23 00:55:48 2012 (r31788)
@@ -1,6 +1,7 @@
{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d
, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
+, alsaLib
}:
# XXX: ?
@@ -24,7 +25,7 @@
buildInputs =
[ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif
- libtiff librsvg libXft gconf libxml2 imagemagick gnutls
+ libtiff librsvg libXft gconf libxml2 imagemagick gnutls alsaLib
]
++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ]
++ stdenv.lib.optional stdenv.isLinux dbus;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Jan 22 10:52:09
2012 (r31787)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Jan 23 00:55:48
2012 (r31788)
@@ -6641,9 +6641,11 @@
Xaw3d = null;
gtk = if stdenv.isDarwin then null else gtkLibs.gtk;
# TODO: these packages don't build on Darwin.
- # XXX: Do we want gconf by default? What is emacs using it for?
gconf = null /* if stdenv.isDarwin then null else gnome.GConf */;
librsvg = if stdenv.isDarwin then null else librsvg;
+ # alsa only on linux
+ alsaLib = if stdenv.isLinux then alsaLib else null;
+ imagemagick = imagemagickBig;
});
emacsPackages = emacs: self: let callPackage = newScope self; in rec {
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
