diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-11-29 12:02:07 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-11-29 12:02:07 +0100 |
| commit | f04aa4fb59e7c41f75762042080b7ccffb93167e (patch) | |
| tree | 27619b41cab391927d1a731dba9bc32757f03975 | |
| parent | 2eace0dfe665799d04ef4d8675d119c2843e15a8 (diff) | |
| download | nixpkgs-f04aa4fb59e7c41f75762042080b7ccffb93167e.tar nixpkgs-f04aa4fb59e7c41f75762042080b7ccffb93167e.tar.gz nixpkgs-f04aa4fb59e7c41f75762042080b7ccffb93167e.tar.bz2 nixpkgs-f04aa4fb59e7c41f75762042080b7ccffb93167e.tar.lz nixpkgs-f04aa4fb59e7c41f75762042080b7ccffb93167e.tar.xz nixpkgs-f04aa4fb59e7c41f75762042080b7ccffb93167e.tar.zst nixpkgs-f04aa4fb59e7c41f75762042080b7ccffb93167e.zip | |
Remove findutils 4.2.27
We only used this version on Darwin, but the regular findutils seems to build fine.
| -rw-r--r-- | pkgs/tools/misc/findutils/4.2.27.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 1 insertions, 20 deletions
diff --git a/pkgs/tools/misc/findutils/4.2.27.nix b/pkgs/tools/misc/findutils/4.2.27.nix deleted file mode 100644 index 591134d692d..00000000000 --- a/pkgs/tools/misc/findutils/4.2.27.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, coreutils}: - -stdenv.mkDerivation { - name = "findutils-4.2.27"; - src = fetchurl { - url = http://nixos.org/tarballs/findutils-4.2.27.tar.gz; - md5 = "f1e0ddf09f28f8102ff3b90f3b5bc920"; - }; - buildInputs = [coreutils]; - patches = [./findutils-path.patch] - # Note: the dietlibc is just to get findutils to compile. The - # locate command probably won't work though. - ++ (if stdenv ? isDietLibC then [./dietlibc-hack.patch] else []); -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dabb187a62d..dacac442af2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -718,12 +718,7 @@ let fileschanged = callPackage ../tools/misc/fileschanged { }; - findutils = - if stdenv.isDarwin - then findutils4227 - else callPackage ../tools/misc/findutils { }; - - findutils4227 = callPackage ../tools/misc/findutils/4.2.27.nix { }; + findutils = callPackage ../tools/misc/findutils { }; finger_bsd = callPackage ../tools/networking/bsd-finger { }; |