From 37ae6de95da8e4f6dcfd00dd6dfc728fe974323f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 Jan 2015 20:34:16 +0100
Subject: [PATCH] s6: don't depend on GNU Make 4.0

The website gives no indication that version 4.x is required to build
this package, and even it if were, then there should be an override in
all-packages.nix instead of referring to the 'gnumake40' attribute
directly in this expression.
---
 pkgs/development/libraries/skalibs/default.nix    |  7 +------
 pkgs/os-specific/linux/s6-linux-utils/default.nix |  8 +-------
 pkgs/servers/s6/default.nix                       |  9 +--------
 pkgs/tools/misc/execline/default.nix              |  8 +-------
 pkgs/tools/misc/s6-portable-utils/default.nix     |  8 +-------
 pkgs/tools/networking/s6-dns/default.nix          |  8 +-------
 pkgs/tools/networking/s6-networking/default.nix   | 10 +---------
 7 files changed, 7 insertions(+), 51 deletions(-)

diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 3fe8e275ea9c..aaa7b3a3d260 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -1,7 +1,4 @@
-{ stdenv
-, fetchurl
-, gnumake40
-}:
+{ stdenv, fetchurl }:
 
 let
 
@@ -18,8 +15,6 @@ in stdenv.mkDerivation rec {
 
   dontDisableStatic = true;
 
-  buildInputs = [ gnumake40 ];
-
   configureFlags = [
     "--enable-force-devr"       # assume /dev/random works
     "--libdir=\${prefix}/lib"
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix
index 76f46a32125b..42a4357c74cf 100644
--- a/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -1,8 +1,4 @@
-{ stdenv
-, fetchurl
-, gnumake40
-, skalibs
-}:
+{ stdenv, fetchurl, skalibs }:
 
 let
 
@@ -19,8 +15,6 @@ in stdenv.mkDerivation rec {
 
   dontDisableStatic = true;
 
-  buildInputs = [ gnumake40 ];
-
   configureFlags = [
     "--includedir=\${prefix}/include"
     "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix
index 87235dcd696b..32d219bf4aaf 100644
--- a/pkgs/servers/s6/default.nix
+++ b/pkgs/servers/s6/default.nix
@@ -1,9 +1,4 @@
-{ stdenv
-, execline
-, fetchurl
-, gnumake40
-, skalibs
-}:
+{ stdenv, execline, fetchurl, skalibs }:
 
 let
 
@@ -20,8 +15,6 @@ in stdenv.mkDerivation rec {
 
   dontDisableStatic = true;
 
-  buildInputs = [ gnumake40 ];
-
   configureFlags = [
     "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
     "--with-include=${skalibs}/include"
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index b2bca22433cc..961262334587 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -1,8 +1,4 @@
-{ stdenv
-, fetchurl
-, gnumake40
-, skalibs
-}:
+{ stdenv, fetchurl, skalibs }:
 
 let
 
@@ -19,8 +15,6 @@ in stdenv.mkDerivation rec {
 
   dontDisableStatic = true;
 
-  buildInputs = [ gnumake40 ];
-
   configureFlags = [
     "--libdir=\${prefix}/lib"
     "--includedir=\${prefix}/include"
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 4d871cf79118..755cfce3d8b8 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -1,8 +1,4 @@
-{ stdenv
-, fetchurl
-, gnumake40
-, skalibs
-}:
+{ stdenv, fetchurl, skalibs }:
 
 let
 
@@ -19,8 +15,6 @@ in stdenv.mkDerivation rec {
 
   dontDisableStatic = true;
 
-  buildInputs = [ gnumake40 ];
-
   configureFlags = [
     "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
     "--with-include=${skalibs}/include"
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
index 4ffa2d931a11..4dae1a1c8c30 100644
--- a/pkgs/tools/networking/s6-dns/default.nix
+++ b/pkgs/tools/networking/s6-dns/default.nix
@@ -1,8 +1,4 @@
-{ stdenv
-, fetchurl
-, gnumake40
-, skalibs
-}:
+{ stdenv, fetchurl, skalibs }:
 
 let
 
@@ -19,8 +15,6 @@ in stdenv.mkDerivation rec {
 
   dontDisableStatic = true;
 
-  buildInputs = [ gnumake40 ];
-
   configureFlags = [
     "--includedir=\${prefix}/include"
     "--libdir=\${prefix}/lib"
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index 87dd783636d6..09d9e722245b 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -1,10 +1,4 @@
-{ stdenv
-, execline
-, fetchurl
-, gnumake40
-, s6Dns
-, skalibs
-}:
+{ stdenv, execline, fetchurl, s6Dns, skalibs }:
 
 let
 
@@ -21,8 +15,6 @@ in stdenv.mkDerivation rec {
 
   dontDisableStatic = true;
 
-  buildInputs = [ gnumake40 ];
-
   configureFlags = [
     "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
     "--with-include=${skalibs}/include"