diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-09-18 17:06:06 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-09-18 17:06:06 +0000 |
| commit | 6dc5ad8a2dbfc42955911743d189cc34cff56410 (patch) | |
| tree | 0729fde0fe060823fd2a28703d507c864132a6d5 /pkgs/tools/text/diffutils | |
| parent | d97dd7989565ae919fe2494196b305997664cbf6 (diff) | |
| download | nixpkgs-6dc5ad8a2dbfc42955911743d189cc34cff56410.tar nixpkgs-6dc5ad8a2dbfc42955911743d189cc34cff56410.tar.gz nixpkgs-6dc5ad8a2dbfc42955911743d189cc34cff56410.tar.bz2 nixpkgs-6dc5ad8a2dbfc42955911743d189cc34cff56410.tar.lz nixpkgs-6dc5ad8a2dbfc42955911743d189cc34cff56410.tar.xz nixpkgs-6dc5ad8a2dbfc42955911743d189cc34cff56410.tar.zst nixpkgs-6dc5ad8a2dbfc42955911743d189cc34cff56410.zip | |
* Prevent a retained dependency on coreutils from stdenv.
svn path=/nixpkgs/trunk/; revision=1435
Diffstat (limited to 'pkgs/tools/text/diffutils')
| -rw-r--r-- | pkgs/tools/text/diffutils/builder.sh | 3 | ||||
| -rw-r--r-- | pkgs/tools/text/diffutils/default.nix | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/tools/text/diffutils/builder.sh b/pkgs/tools/text/diffutils/builder.sh new file mode 100644 index 00000000000..58dcc3d8ad0 --- /dev/null +++ b/pkgs/tools/text/diffutils/builder.sh @@ -0,0 +1,3 @@ +. $stdenv/setup +if test -n "$coreutils"; then PATH=$coreutils/bin:$PATH; fi +genericBuild \ No newline at end of file diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 7fc4fe3d5fb..783bf5d06f7 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -1,9 +1,12 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, coreutils ? null}: stdenv.mkDerivation { name = "diffutils-2.8.1"; + builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nluug.nl/pub/gnu/diffutils/diffutils-2.8.1.tar.gz; md5 = "71f9c5ae19b60608f6c7f162da86a428"; }; + /* If no explicit coreutils is given, use the one from stdenv. */ + inherit coreutils; } |