From 65a411cadce4848315592062c74f7ac4e2930f66 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Nov 2005 13:01:48 +0000
Subject: [PATCH] * Remove XFree86.

svn path=/nixpkgs/trunk/; revision=4220
---
 pkgs/servers/x11/xfree86/builder.sh  | 13 -----------
 pkgs/servers/x11/xfree86/default.nix | 32 ----------------------------
 pkgs/servers/x11/xfree86/host.def    | 30 --------------------------
 pkgs/system/all-packages-generic.nix |  6 ------
 4 files changed, 81 deletions(-)
 delete mode 100644 pkgs/servers/x11/xfree86/builder.sh
 delete mode 100644 pkgs/servers/x11/xfree86/default.nix
 delete mode 100644 pkgs/servers/x11/xfree86/host.def

diff --git a/pkgs/servers/x11/xfree86/builder.sh b/pkgs/servers/x11/xfree86/builder.sh
deleted file mode 100644
index 9c23b574e4c9..000000000000
--- a/pkgs/servers/x11/xfree86/builder.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-export buildinputs="$bison $flex"
-. $stdenv/setup || exit 1
-
-tar xvfz $src1 || exit 1
-tar xvfz $src2 || exit 1
-tar xvfz $src3 || exit 1
-cd xc || exit 1
-sed "s^@OUT@^$out^" < $hostdef > config/cf/host.def
-make World || exit 1
-make install || exit 1
-
-# !!! Hack to get fontconfig to work.
-ln -s /usr/X11R6/lib/X11/fonts $out/lib/X11/fonts
diff --git a/pkgs/servers/x11/xfree86/default.nix b/pkgs/servers/x11/xfree86/default.nix
deleted file mode 100644
index 64eced0c46a2..000000000000
--- a/pkgs/servers/x11/xfree86/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ buildServer ? true
-, buildClientLibs ? true
-, stdenv, fetchurl, bison, flex}:
-
-assert !buildServer; # we don't support this currently
-assert buildClientLibs; # we don't support *not* doing this currently
-assert bison != null && flex != null;
-
-stdenv.mkDerivation {
-  name = "xfree86-4.3";
-
-  builder = ./builder.sh;
-  hostdef = ./host.def;
-  src1 = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/X430src-1.tgz;
-    md5 = "4f241a4f867363f40efa2b00dca292af";
-  };
-  src2 = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/X430src-2.tgz;
-    md5 = "844c2ee908d21dbf8911fd13115bf8b4";
-  };
-  src3 = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/X430src-3.tgz;
-    md5 = "b82a0443e1b7bf860e4343e6b6766cb6";
-  };
-
-  buildServer = buildServer;
-  buildClientLibs = buildClientLibs;
-
-  bison = bison;
-  flex = flex;
-}
diff --git a/pkgs/servers/x11/xfree86/host.def b/pkgs/servers/x11/xfree86/host.def
deleted file mode 100644
index 0085f9dab259..000000000000
--- a/pkgs/servers/x11/xfree86/host.def
+++ /dev/null
@@ -1,30 +0,0 @@
-#define BuildServer		NO
-#define BuildFontServer         NO
-#define BuildSpeedo             NO
-#define BuildType1              NO
-#define BuildCID                NO
-#define BuildFreeType           NO
-#define BuildXTrueType          NO
-#define BuildFonts              NO
-#define BuildXftLibrary		NO
-#define BuildXft1Library	NO
-#define BuildClients		NO
-#define BuildDocs		NO
-#define BuildLibraries		YES
-#define BuildGLXLibrary		NO
-#define BuildOSMesaLib		NO
-#define BuildOSMesaLib		NO
-#define BuildXvMCExt		NO
-#define BuildXvMCLibrary	NO
-
-#define XF86Server              NO
-#define XnestServer             NO
-#define XVirtualFramebufferServer	NO
-#define XprtServer		NO
-#define XF86CardDrivers
-#define XInputDrivers
-
-#define ProjectRoot @OUT@
-#define NothingOutsideProjectRoot YES
-#define EtcX11Directory ProjectRoot/etc
-#define UseSeparateConfDir	NO
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 5cac9cac054b..1cf7ee7ee227 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1280,12 +1280,6 @@ rec {
     db4Support = true;
   };
 
-  xfree86 = (import ../servers/x11/xfree86) {
-    inherit fetchurl stdenv flex bison;
-    buildServer = false;
-    buildClientLibs = true;
-  };
-
   xorg = import ../servers/x11/xorg {
     inherit fetchurl stdenv pkgconfig freetype # fontconfig
       expat libdrm libpng zlib perl mesa;