From 41ceac357c5a71ca21be32309c486639f2a23450 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 12 Jul 2005 14:03:33 +0000 Subject: [PATCH] * Prevent a retained dependency on static-tools in stdenv-linux (findutils stores a reference to coreutils). svn path=/nixpkgs/trunk/; revision=3318 --- pkgs/system/all-packages-generic.nix | 2 +- pkgs/tools/misc/findutils/default.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 88f717cef7a4..adaf250d07df 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -40,7 +40,7 @@ rec { }; findutils = (import ../tools/misc/findutils) { - inherit fetchurl stdenv; + inherit fetchurl stdenv coreutils; }; getopt = (import ../tools/misc/getopt) { diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index da086e80c084..7f8f67627de9 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, coreutils}: stdenv.mkDerivation { name = "findutils-4.2.20"; @@ -6,4 +6,5 @@ stdenv.mkDerivation { url = http://ftp.gnu.org/gnu/findutils/findutils-4.2.20.tar.gz; md5 = "7c8e12165b221dd67a19c00d780437a4"; }; + buildInputs = [coreutils]; }