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

@@ -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"

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"

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"

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"

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"

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"

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"