alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

make emacs buildable

Browse source
This commit is contained in:
Jude Taylor 2015-09-21 12:17:03 -07:00
parent 3fcbd5a829
commit 71d98332e9
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/editors/emacs-24/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
, alsaLib, cairo, acl, gpm , alsaLib, cairo, acl, gpm, AppKit, Foundation, libobjc
, withX ? !stdenv.isDarwin , withX ? !stdenv.isDarwin
, withGTK3 ? false, gtk3 ? null , withGTK3 ? false, gtk3 ? null
, withGTK2 ? true, gtk2 , withGTK2 ? true, gtk2
@ -49,6 +49,12 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (withX && withGTK3) gtk3 ++ stdenv.lib.optional (withX && withGTK3) gtk3
++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo; ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo;
propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Foundation libobjc
];
NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
"/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
configureFlags = configureFlags =
if stdenv.isDarwin if stdenv.isDarwin
then [ "--with-ns" "--disable-ns-self-contained" ] then [ "--with-ns" "--disable-ns-self-contained" ]

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

@ -11006,6 +11006,8 @@ let
imagemagick = null; imagemagick = null;
acl = null; acl = null;
gpm = null; gpm = null;
inherit (darwin.apple_sdk.frameworks) AppKit Foundation;
inherit (darwin) libobjc;
}; };
emacs24-nox = lowPrio (appendToName "nox" (emacs24.override { emacs24-nox = lowPrio (appendToName "nox" (emacs24.override {