diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-07-20 14:22:43 -0700 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-07-28 20:08:53 -0700 |
| commit | 5c896e5511608592b94960c5c419f70dadc5b527 (patch) | |
| tree | c4937a6ed430ec3d70dba491b41916ad5f7795da /pkgs/servers | |
| parent | eca6aa0e8df75505850786bbb5ed8d85e85642ca (diff) | |
| download | nixlib-5c896e5511608592b94960c5c419f70dadc5b527.tar nixlib-5c896e5511608592b94960c5c419f70dadc5b527.tar.gz nixlib-5c896e5511608592b94960c5c419f70dadc5b527.tar.bz2 nixlib-5c896e5511608592b94960c5c419f70dadc5b527.tar.lz nixlib-5c896e5511608592b94960c5c419f70dadc5b527.tar.xz nixlib-5c896e5511608592b94960c5c419f70dadc5b527.tar.zst nixlib-5c896e5511608592b94960c5c419f70dadc5b527.zip | |
emacs: Update Mac Port Emacs to 24.5-mac-5.9
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 336ae6526287..a43fb6d77069 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 - libpciaccess inputproto xextproto randrproto renderproto presentproto + 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, |