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.

7 files changed, 7 insertions, 51 deletions

diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 3fe8e275ea9..aaa7b3a3d26 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 76f46a32125..42a4357c74c 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 87235dcd696..32d219bf4aa 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 b2bca22433c..96126233458 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 4d871cf7911..755cfce3d8b 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 4ffa2d931a1..4dae1a1c8c3 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 87dd783636d..09d9e722245 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"