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: 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/tools/networking/s6-networking/default.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'pkgs/tools/networking/s6-networking')

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"
-- 
cgit 1.4.1