* Make xlibs build again.

svn path=/nixpkgs/trunk/; revision=1449
2004-09-18 21:11:16 +00:00
parent 698967c01d
commit be49175db4
4 changed files with 9 additions and 10 deletions
--- 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) {
--- 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=.