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

emacs24: fix build on darwin

Browse Source
This commit is contained in:
Jason "Don" O'Conal 2013-07-03 19:52:22 +10:00
parent e84ba407f9
commit 72a771b6e4
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ EOF
doCheck = true; doCheck = true;
meta = { meta = with stdenv.lib; {
description = "GNU Emacs 24, the extensible, customizable text editor"; description = "GNU Emacs 24, the extensible, customizable text editor";
longDescription = '' longDescription = ''
@ -67,7 +67,7 @@ EOF
homepage = "http://www.gnu.org/software/emacs/"; homepage = "http://www.gnu.org/software/emacs/";
license = "GPLv3+"; license = "GPLv3+";
maintainers = with stdenv.lib.maintainers; [ ludo simons chaoflow ]; maintainers = with maintainers; [ chaoflow lovek323 ludo simons ];
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
}; };
} }

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

@ -7232,6 +7232,12 @@ let
alsaLib = null; alsaLib = null;
imagemagick = null; imagemagick = null;
texinfo = texinfo5; texinfo = texinfo5;
# use gccApple on darwin to deal with: unexec: 'my_edata is not in section
# __data'
stdenv = if stdenv.isDarwin
then stdenvAdapters.overrideGCC stdenv gccApple
else stdenv;
}; };
emacsPackages = emacs: self: let callPackage = newScope self; in rec { emacsPackages = emacs: self: let callPackage = newScope self; in rec {