3
0
Fork 0
forked from mirrors/nixpkgs

remove old patches and attributes from xorgserver

This commit is contained in:
Jude Taylor 2015-12-16 12:03:18 -08:00
parent 79a3c8a952
commit 848064cef6

View file

@ -340,16 +340,12 @@ in
# Patches can be pulled from the server-*-apple branches of:
# http://cgit.freedesktop.org/~jeremyhu/xserver/
patches = commonPatches ++ [
./darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch
./darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
./darwin/0003-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
./darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch
./darwin/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch
./darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch
./darwin/private-extern.patch
./darwin/bundle_main.patch
./darwin/stub.patch
./darwin/function-pointer-test.patch
];
configureFlags = [
# note: --enable-xquartz is auto
@ -360,9 +356,6 @@ in
"--with-bundle-id-prefix=org.nixos.xquartz"
"--with-sha1=CommonCrypto"
];
__impureHostDeps = ["/System/Library" "/usr"];
NIX_CFLAGS_COMPILE = "-F/System/Library/Frameworks -I/usr/include";
NIX_CFLAGS_LINK = "-L/usr/lib";
preConfigure = ''
ensureDir $out/Applications
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error"