From be49175db4727e938318bc3ec758dd22d8a2660c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 18 Sep 2004 21:11:16 +0000
Subject: [PATCH] * Make xlibs build again.

svn path=/nixpkgs/trunk/; revision=1449
---
 pkgs/BUGS                                         | 7 ++++++-
 pkgs/TODO                                         | 6 ------
 pkgs/development/libraries/xlibs/default.nix      | 4 ++--
 pkgs/development/libraries/xlibs/xlibs/builder.sh | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/BUGS b/pkgs/BUGS
index f6d40bc6947..10ebea67f80 100644
--- a/pkgs/BUGS
+++ b/pkgs/BUGS
@@ -58,4 +58,9 @@ stdenv.mkDerivation {
   executable doesn't use against any library in gcc.  The reason is
   that the gcc passes a `-lgcc_s' switch to the linker.  Solution:
   patch the linker so that rpaths are only added for libraries that we
-  actually use.
\ No newline at end of file
+  actually use.
+
+
+* Perl has retained dependencies on gcc, binutils, coreutils, sed.
+
+
diff --git a/pkgs/TODO b/pkgs/TODO
index 73c442d7888..c63a40d85bc 100644
--- a/pkgs/TODO
+++ b/pkgs/TODO
@@ -10,9 +10,3 @@
 
 * After building gcc, filter out references to /tmp/nix... in
   .../lib/libsupc++.la and .../lib/libstdc++.la
-
-
-
-* change dontMake & dontMakeInstall into dontBuild and dontInstall in
-  ./development/libraries/xlibs/xlibs/builder.sh (or put it in its
-  default.nix)
diff --git a/pkgs/development/libraries/xlibs/default.nix b/pkgs/development/libraries/xlibs/default.nix
index 38dab60270c..f6b26c39d9e 100644
--- a/pkgs/development/libraries/xlibs/default.nix
+++ b/pkgs/development/libraries/xlibs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, freetype, expat, patch}:
+{stdenv, fetchurl, pkgconfig, freetype, expat}:
 
 rec {
 
@@ -55,7 +55,7 @@ rec {
   };
 
   libXmu = (import ./libXmu) {
-    inherit fetchurl stdenv pkgconfig xproto libX11 libXt libXext patch;
+    inherit fetchurl stdenv pkgconfig xproto libX11 libXt libXext;
   };
 
   libXpm = (import ./libXpm) {
diff --git a/pkgs/development/libraries/xlibs/xlibs/builder.sh b/pkgs/development/libraries/xlibs/xlibs/builder.sh
index abcab635a60..bfa2c056f4e 100644
--- a/pkgs/development/libraries/xlibs/xlibs/builder.sh
+++ b/pkgs/development/libraries/xlibs/xlibs/builder.sh
@@ -1,5 +1,5 @@
 . $stdenv/setup
-dontMake=1
+dontBuild=1
 dontMakeInstall=1
 nop() {
     sourceRoot=.