From 848064cef6a9368898bfb8f01c1cb2d5c8373a80 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Wed, 16 Dec 2015 12:03:18 -0800 Subject: [PATCH] remove old patches and attributes from xorgserver --- pkgs/servers/x11/xorg/overrides.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 78be046366db..d6e18254760f 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -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"