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

emacs-24 alsaLib and imagemagickBig

Browse Source 
svn path=/nixpkgs/trunk/; revision=31788
This commit is contained in:
Florian Friesdorf 2012-01-23 00:55:48 +00:00
parent 44e38c020a
commit 5c05e3f866
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d
, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
, alsaLib
}: }:
# XXX: ? # XXX: ?
@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif [ 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.optionals (gtk != null) [ gtk pkgconfig ]
++ stdenv.lib.optional stdenv.isLinux dbus; ++ stdenv.lib.optional stdenv.isLinux dbus;

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

@ -6641,9 +6641,11 @@ let
Xaw3d = null; Xaw3d = null;
gtk = if stdenv.isDarwin then null else gtkLibs.gtk; gtk = if stdenv.isDarwin then null else gtkLibs.gtk;
# TODO: these packages don't build on Darwin. # 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 */; gconf = null /* if stdenv.isDarwin then null else gnome.GConf */;
librsvg = if stdenv.isDarwin then null else librsvg; 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 { emacsPackages = emacs: self: let callPackage = newScope self; in rec {