* Remove patch arguments.

svn path=/nixpkgs/trunk/; revision=1462
This commit is contained in:
Eelco Dolstra 2004-09-19 10:34:01 +00:00
parent 4e98bfc5a7
commit dde13d1ada
5 changed files with 9 additions and 11 deletions

View file

@ -4,7 +4,7 @@
, pythonBindings ? false , pythonBindings ? false
, javaBindings ? false , javaBindings ? false
, stdenv, fetchurl , stdenv, fetchurl
, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, patch , openssl ? null, httpd ? null, db4 ? null, expat, swig ? null
}: }:
assert expat != null; assert expat != null;
@ -35,6 +35,6 @@ stdenv.mkDerivation {
python = if pythonBindings then swig.python else null; python = if pythonBindings then swig.python else null;
j2sdk = if javaBindings then swig.j2sdk else null; j2sdk = if javaBindings then swig.j2sdk else null;
inherit expat patch localServer httpServer sslSupport inherit expat localServer httpServer sslSupport
pythonBindings javaBindings; pythonBindings javaBindings;
} }

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, xproto, libX11, libXt, libXext, patch}: {stdenv, fetchurl, pkgconfig, xproto, libX11, libXt, libXext}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libXmu-6.2.3"; name = "libXmu-6.2.3";
@ -6,7 +6,7 @@ stdenv.mkDerivation {
url = http://freedesktop.org/~xlibs/release/libXmu-6.2.3.tar.bz2; url = http://freedesktop.org/~xlibs/release/libXmu-6.2.3.tar.bz2;
md5 = "7671745bd8a1b0595847541479a327d6"; md5 = "7671745bd8a1b0595847541479a327d6";
}; };
buildInputs = [pkgconfig patch]; buildInputs = [pkgconfig];
propagatedBuildInputs = [xproto libX11 libXt libXext]; propagatedBuildInputs = [xproto libX11 libXt libXext];
patches = ./no-Xaw.patch; patches = ./no-Xaw.patch;
} }

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, patch, perl, m4}: {stdenv, fetchurl, perl, m4}:
assert patch != null && perl != null && m4 != null; assert perl != null && m4 != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "uml-2.4.24-2"; name = "uml-2.4.24-2";
@ -19,5 +19,5 @@ stdenv.mkDerivation {
# hostfsPatch = ./hostfs.patch; # hostfsPatch = ./hostfs.patch;
# hostfsAccessPatch = ./hostfs-access.patch; # hostfsAccessPatch = ./hostfs-access.patch;
config = ./config; config = ./config;
buildInputs = [patch perl m4]; buildInputs = [perl m4];
} }

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, patch}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "sysvinit-2.85"; name = "sysvinit-2.85";
@ -8,5 +8,4 @@ stdenv.mkDerivation {
md5 = "8a2d8f1ed5a2909da04132fefa44905e"; md5 = "8a2d8f1ed5a2909da04132fefa44905e";
}; };
srcPatch = ./patch; srcPatch = ./patch;
inherit patch;
} }

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, patch}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "util-linux-2.12"; name = "util-linux-2.12";
@ -8,5 +8,4 @@ stdenv.mkDerivation {
md5 = "997adf78b98d9d1c5db4f37ea982acff"; md5 = "997adf78b98d9d1c5db4f37ea982acff";
}; };
mconfigPatch = ./MCONFIG.patch; mconfigPatch = ./MCONFIG.patch;
inherit patch;
} }