diff options
author | John Wiegley <johnw@newartisans.com> | 2015-07-30 16:21:39 -0700 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2015-07-30 16:21:39 -0700 |
commit | 23562aad59048e8e1202e618fcf402079f1593b8 (patch) | |
tree | 7a7b0ee2b54c68b04deac83265aa359291dc8e60 /pkgs/servers | |
parent | 6c1d408b47cc030edcec7a05d19aa2906382d7dc (diff) | |
download | nixlib-23562aad59048e8e1202e618fcf402079f1593b8.tar nixlib-23562aad59048e8e1202e618fcf402079f1593b8.tar.gz nixlib-23562aad59048e8e1202e618fcf402079f1593b8.tar.bz2 nixlib-23562aad59048e8e1202e618fcf402079f1593b8.tar.lz nixlib-23562aad59048e8e1202e618fcf402079f1593b8.tar.xz nixlib-23562aad59048e8e1202e618fcf402079f1593b8.tar.zst nixlib-23562aad59048e8e1202e618fcf402079f1593b8.zip |
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.
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a43fb6d77069..336ae6526287 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, |