public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s6: don't depend on GNU Make 4.0

Browse Source 
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.
This commit is contained in:
Peter Simons 2015-01-01 20:34:16 +01:00
parent ac55bb22be
commit 37ae6de95d
7 changed files with 7 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/skalibs/default.nix
View File

@ -1,7 +1,4 @@
{ stdenv { stdenv, fetchurl }:
, fetchurl
, gnumake40
}:
let let
@ -18,8 +15,6 @@ in stdenv.mkDerivation rec {
dontDisableStatic = true; dontDisableStatic = true;
buildInputs = [ gnumake40 ];
configureFlags = [ configureFlags = [
"--enable-force-devr" # assume /dev/random works "--enable-force-devr" # assume /dev/random works
"--libdir=\${prefix}/lib" "--libdir=\${prefix}/lib"

8
pkgs/os-specific/linux/s6-linux-utils/default.nix
View File

@ -1,8 +1,4 @@
{ stdenv { stdenv, fetchurl, skalibs }:
, fetchurl
, gnumake40
, skalibs
}:
let let
@ -19,8 +15,6 @@ in stdenv.mkDerivation rec {
dontDisableStatic = true; dontDisableStatic = true;
buildInputs = [ gnumake40 ];
configureFlags = [ configureFlags = [
"--includedir=\${prefix}/include" "--includedir=\${prefix}/include"
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"

9
pkgs/servers/s6/default.nix
View File

@ -1,9 +1,4 @@
{ stdenv { stdenv, execline, fetchurl, skalibs }:
, execline
, fetchurl
, gnumake40
, skalibs
}:
let let
@ -20,8 +15,6 @@ in stdenv.mkDerivation rec {
dontDisableStatic = true; dontDisableStatic = true;
buildInputs = [ gnumake40 ];
configureFlags = [ configureFlags = [
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
"--with-include=${skalibs}/include" "--with-include=${skalibs}/include"

8
pkgs/tools/misc/execline/default.nix
View File

@ -1,8 +1,4 @@
{ stdenv { stdenv, fetchurl, skalibs }:
, fetchurl
, gnumake40
, skalibs
}:
let let
@ -19,8 +15,6 @@ in stdenv.mkDerivation rec {
dontDisableStatic = true; dontDisableStatic = true;
buildInputs = [ gnumake40 ];
configureFlags = [ configureFlags = [
"--libdir=\${prefix}/lib" "--libdir=\${prefix}/lib"
"--includedir=\${prefix}/include" "--includedir=\${prefix}/include"

8
pkgs/tools/misc/s6-portable-utils/default.nix
View File

@ -1,8 +1,4 @@
{ stdenv { stdenv, fetchurl, skalibs }:
, fetchurl
, gnumake40
, skalibs
}:
let let
@ -19,8 +15,6 @@ in stdenv.mkDerivation rec {
dontDisableStatic = true; dontDisableStatic = true;
buildInputs = [ gnumake40 ];
configureFlags = [ configureFlags = [
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
"--with-include=${skalibs}/include" "--with-include=${skalibs}/include"

8
pkgs/tools/networking/s6-dns/default.nix
View File

@ -1,8 +1,4 @@
{ stdenv { stdenv, fetchurl, skalibs }:
, fetchurl
, gnumake40
, skalibs
}:
let let
@ -19,8 +15,6 @@ in stdenv.mkDerivation rec {
dontDisableStatic = true; dontDisableStatic = true;
buildInputs = [ gnumake40 ];
configureFlags = [ configureFlags = [
"--includedir=\${prefix}/include" "--includedir=\${prefix}/include"
"--libdir=\${prefix}/lib" "--libdir=\${prefix}/lib"

10
pkgs/tools/networking/s6-networking/default.nix
View File

@ -1,10 +1,4 @@
{ stdenv { stdenv, execline, fetchurl, s6Dns, skalibs }:
, execline
, fetchurl
, gnumake40
, s6Dns
, skalibs
}:
let let
@ -21,8 +15,6 @@ in stdenv.mkDerivation rec {
dontDisableStatic = true; dontDisableStatic = true;
buildInputs = [ gnumake40 ];
configureFlags = [ configureFlags = [
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
"--with-include=${skalibs}/include" "--with-include=${skalibs}/include"