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

Revert "emacs: Update Mac Port Emacs to 24.5-mac-5.9"

Browse Source 
This reverts commit 5c896e5511608592b94960c5c419f70dadc5b527, which was
a set of local changes unrelated to the commit title.
This commit is contained in:
John Wiegley 2015-07-30 16:21:39 -07:00
parent 6c1d408b47
commit 23562aad59
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -21,8 +21,6 @@ self: super: {
options = dontCheck super.options; options = dontCheck super.options;
statistics = dontCheck super.statistics; statistics = dontCheck super.statistics;
text = dontCheck super.text; text = dontCheck super.text;
c2hs = dontCheck super.c2hs;
mockery = dontCheck super.mockery;
# The package doesn't compile with ruby 1.9, which is our default at the moment. # The package doesn't compile with ruby 1.9, which is our default at the moment.
hruby = super.hruby.override { ruby = pkgs.ruby_2_1; }; hruby = super.hruby.override { ruby = pkgs.ruby_2_1; };

2
pkgs/development/haskell-modules/hackage-packages.nix
View File

@ -54313,7 +54313,7 @@ self: {
yesod-static yesod-static
]; ];
buildTools = [ buildTools = [
curl git gnupg openssh perl rsync wget which bup curl git gnupg lsof openssh perl rsync wget which
]; ];
configureFlags = [ "-fassistant" "-fproduction" ]; configureFlags = [ "-fassistant" "-fproduction" ];
preConfigure = "export HOME=$TEMPDIR"; preConfigure = "export HOME=$TEMPDIR";

10
pkgs/servers/x11/xorg/overrides.nix
View File

@ -79,9 +79,9 @@ in
nativeBuildInputs = [ args.python ]; nativeBuildInputs = [ args.python ];
}; };
# libxkbfile = attrs: attrs // { libxkbfile = attrs: attrs // {
# patches = lib.optional stdenv.cc.isClang ./libxkbfile-clang36.patch; patches = lib.optional stdenv.cc.isClang ./libxkbfile-clang36.patch;
# }; };
libpciaccess = attrs : attrs // { libpciaccess = attrs : attrs // {
patches = [ ./libpciaccess-apple.patch ]; patches = [ ./libpciaccess-apple.patch ];
@ -285,9 +285,9 @@ in
dmxproto /*libdmx not used*/ xf86vidmodeproto dmxproto /*libdmx not used*/ xf86vidmodeproto
recordproto libXext pixman libXfont recordproto libXext pixman libXfont
damageproto xcmiscproto bigreqsproto damageproto xcmiscproto bigreqsproto
inputproto xextproto randrproto renderproto presentproto libpciaccess inputproto xextproto randrproto renderproto presentproto
dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto
] ++ lib.optional (!isDarwin) libpciaccess; ];
commonPatches = [ ./xorgserver-xkbcomp-path.patch ] commonPatches = [ ./xorgserver-xkbcomp-path.patch ]
++ lib.optional isDarwin ./fix-clang.patch; ++ lib.optional isDarwin ./fix-clang.patch;
# XQuartz requires two compilations: the first to get X / XQuartz, # XQuartz requires two compilations: the first to get X / XQuartz,