From 88ba45c4992f04a40395ad885a5c5402d1b0c642 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 16 Jan 2009 17:13:35 +0000 Subject: [PATCH] svn path=/nixpkgs/branches/stdenv-updates/; revision=13791 --- pkgs/tools/text/gnugrep/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index c44aa10c700..5e1efba7c00 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -18,4 +18,6 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/grep/; description = "GNU implementation of the Unix grep command"; }; + + passthru = {inherit pcre;}; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 750236f44d4..52281a9b5c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -596,7 +596,7 @@ let }; coreutils = useFromStdenv "coreutils" - ((if stdenv ? isDietLibC + (makeOverridable (if stdenv ? isDietLibC then import ../tools/misc/coreutils-5 else import ../tools/misc/coreutils) {