From 23562aad59048e8e1202e618fcf402079f1593b8 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 30 Jul 2015 16:21:39 -0700 Subject: [PATCH] Revert "emacs: Update Mac Port Emacs to 24.5-mac-5.9" This reverts commit 5c896e5511608592b94960c5c419f70dadc5b527, which was a set of local changes unrelated to the commit title. --- .../haskell-modules/configuration-common.nix | 2 -- pkgs/development/haskell-modules/hackage-packages.nix | 2 +- pkgs/servers/x11/xorg/overrides.nix | 10 +++++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 30c5912a5a8..5260d508ab1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -21,8 +21,6 @@ self: super: { options = dontCheck super.options; statistics = dontCheck super.statistics; 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. hruby = super.hruby.override { ruby = pkgs.ruby_2_1; }; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 622ebfa7473..ba7bc517aa7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -54313,7 +54313,7 @@ self: { yesod-static ]; buildTools = [ - curl git gnupg openssh perl rsync wget which + bup curl git gnupg lsof openssh perl rsync wget which ]; configureFlags = [ "-fassistant" "-fproduction" ]; preConfigure = "export HOME=$TEMPDIR"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a43fb6d7706..336ae652628 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -79,9 +79,9 @@ in nativeBuildInputs = [ args.python ]; }; - # libxkbfile = attrs: attrs // { - # patches = lib.optional stdenv.cc.isClang ./libxkbfile-clang36.patch; - # }; + libxkbfile = attrs: attrs // { + patches = lib.optional stdenv.cc.isClang ./libxkbfile-clang36.patch; + }; libpciaccess = attrs : attrs // { patches = [ ./libpciaccess-apple.patch ]; @@ -285,9 +285,9 @@ in dmxproto /*libdmx not used*/ xf86vidmodeproto recordproto libXext pixman libXfont damageproto xcmiscproto bigreqsproto - inputproto xextproto randrproto renderproto presentproto + libpciaccess inputproto xextproto randrproto renderproto presentproto dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto - ] ++ lib.optional (!isDarwin) libpciaccess; + ]; commonPatches = [ ./xorgserver-xkbcomp-path.patch ] ++ lib.optional isDarwin ./fix-clang.patch; # XQuartz requires two compilations: the first to get X / XQuartz,