diff options
| author | Peter Simons <simons@cryp.to> | 2015-01-01 20:34:16 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-01-01 20:36:58 +0100 |
| commit | 37ae6de95da8e4f6dcfd00dd6dfc728fe974323f (patch) | |
| tree | 77736bd23089f93642f2993e38a48767a749ecaf /pkgs/tools/networking/s6-networking | |
| parent | ac55bb22bef25fad6780cc89d77033bde05a2edc (diff) | |
| download | nixpkgs-37ae6de95da8e4f6dcfd00dd6dfc728fe974323f.tar nixpkgs-37ae6de95da8e4f6dcfd00dd6dfc728fe974323f.tar.gz nixpkgs-37ae6de95da8e4f6dcfd00dd6dfc728fe974323f.tar.bz2 nixpkgs-37ae6de95da8e4f6dcfd00dd6dfc728fe974323f.tar.lz nixpkgs-37ae6de95da8e4f6dcfd00dd6dfc728fe974323f.tar.xz nixpkgs-37ae6de95da8e4f6dcfd00dd6dfc728fe974323f.tar.zst nixpkgs-37ae6de95da8e4f6dcfd00dd6dfc728fe974323f.zip | |
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.
Diffstat (limited to 'pkgs/tools/networking/s6-networking')
| -rw-r--r-- | pkgs/tools/networking/s6-networking/default.nix | 10 |
1 files changed, 1 insertions, 9 deletions
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" |