1 files changed, 8 insertions, 17 deletions
diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix
index e101eea0cd397..f71b877c8c528 100644
--- a/pkgs/development/tools/build-managers/bmake/default.nix
+++ b/pkgs/development/tools/build-managers/bmake/default.nix
@@ -1,31 +1,22 @@
 { stdenv, fetchurl
-, gnugrep, coreutils, getopt
+, getopt
 }:
 
 stdenv.mkDerivation rec {
   name    = "bmake-${version}";
-  version = "20121212";
+  version = "20181221";
 
   src = fetchurl {
-    # really wish this URL was versioned. if this changes for some
-    # update in the future, we'll have to backport those updates to
-    # any stable branches so builds can continue to work. :(
-    url    = "http://www.crufty.net/ftp/pub/sjg/bmake.tar.gz";
+    url    = "http://www.crufty.net/ftp/pub/sjg/${name}.tar.gz";
     sha256 = "0zp6yy27z52qb12bgm3hy1dwal2i570615pqqk71zwhcxfs4h2gw";
   };
 
-  nativeBuildInputs =
-    [ gnugrep coreutils getopt
-    ];
+  nativeBuildInputs = [ getopt ];
 
-  # unexport-env sets PATH to a bogus value that won't be
-  # possible to use inside the build sandbox. nuke that test;
-  # we could also re-construct the PATH variable a bit based on
-  # nativeBuildInputs, but not for now
-  patchPhase = ''
-    substituteInPlace ./unit-tests/Makefile.in \
-      --replace "unexport-env" ""
-  '';
+  patches = [
+    ./bootstrap-fix.patch
+    ./fix-unexport-env-test.patch
+  ];
 
   meta = with stdenv.lib; {
     description = "Portable version of NetBSD 'make'";