From dde13d1ada451d8a8b24390e98fd6e93066a4b00 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 19 Sep 2004 10:34:01 +0000 Subject: * Remove patch arguments. svn path=/nixpkgs/trunk/; revision=1462 --- pkgs/applications/version-management/subversion-1.1rc/default.nix | 4 ++-- pkgs/development/libraries/xlibs/libXmu/default.nix | 4 ++-- pkgs/misc/uml/default.nix | 6 +++--- pkgs/os-specific/linux/sysvinit/default.nix | 3 +-- pkgs/os-specific/linux/util-linux/default.nix | 3 +-- 5 files changed, 9 insertions(+), 11 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/subversion-1.1rc/default.nix b/pkgs/applications/version-management/subversion-1.1rc/default.nix index e31dc794111..d2c371a52b3 100644 --- a/pkgs/applications/version-management/subversion-1.1rc/default.nix +++ b/pkgs/applications/version-management/subversion-1.1rc/default.nix @@ -4,7 +4,7 @@ , pythonBindings ? false , javaBindings ? false , stdenv, fetchurl -, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, patch +, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null }: assert expat != null; @@ -35,6 +35,6 @@ stdenv.mkDerivation { python = if pythonBindings then swig.python else null; j2sdk = if javaBindings then swig.j2sdk else null; - inherit expat patch localServer httpServer sslSupport + inherit expat localServer httpServer sslSupport pythonBindings javaBindings; } diff --git a/pkgs/development/libraries/xlibs/libXmu/default.nix b/pkgs/development/libraries/xlibs/libXmu/default.nix index 11be462dbaf..aa583a5fd32 100644 --- a/pkgs/development/libraries/xlibs/libXmu/default.nix +++ b/pkgs/development/libraries/xlibs/libXmu/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, xproto, libX11, libXt, libXext, patch}: +{stdenv, fetchurl, pkgconfig, xproto, libX11, libXt, libXext}: stdenv.mkDerivation { name = "libXmu-6.2.3"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = http://freedesktop.org/~xlibs/release/libXmu-6.2.3.tar.bz2; md5 = "7671745bd8a1b0595847541479a327d6"; }; - buildInputs = [pkgconfig patch]; + buildInputs = [pkgconfig]; propagatedBuildInputs = [xproto libX11 libXt libXext]; patches = ./no-Xaw.patch; } diff --git a/pkgs/misc/uml/default.nix b/pkgs/misc/uml/default.nix index 0f86d507427..06266cbb9b5 100644 --- a/pkgs/misc/uml/default.nix +++ b/pkgs/misc/uml/default.nix @@ -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 { name = "uml-2.4.24-2"; @@ -19,5 +19,5 @@ stdenv.mkDerivation { # hostfsPatch = ./hostfs.patch; # hostfsAccessPatch = ./hostfs-access.patch; config = ./config; - buildInputs = [patch perl m4]; + buildInputs = [perl m4]; } diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index f9bbc3bedbf..37036d24a1d 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, patch}: +{stdenv, fetchurl}: stdenv.mkDerivation { name = "sysvinit-2.85"; @@ -8,5 +8,4 @@ stdenv.mkDerivation { md5 = "8a2d8f1ed5a2909da04132fefa44905e"; }; srcPatch = ./patch; - inherit patch; } diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index a346d134c80..fb624cba0fe 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, patch}: +{stdenv, fetchurl}: stdenv.mkDerivation { name = "util-linux-2.12"; @@ -8,5 +8,4 @@ stdenv.mkDerivation { md5 = "997adf78b98d9d1c5db4f37ea982acff"; }; mconfigPatch = ./MCONFIG.patch; - inherit patch; } -- cgit 1.4.1