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

kubernetes: fix on Darwin

Browse Source 
Also bump its Go version to 1.7, since 1.6 is fatally flawed on macOS 10.12
This commit is contained in:
Dan Peebles 2017-03-10 13:31:05 -05:00
parent 2b450377bf
commit 7dff6a8689
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/cluster/kubernetes/default.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
postBuild = '' postBuild = ''
./hack/generate-docs.sh ./hack/generate-docs.sh
(cd build/pause && gcc pause.c -o pause) (cd build/pause && cc pause.c -o pause)
''; '';
installPhase = '' installPhase = ''
@ -72,6 +72,6 @@ stdenv.mkDerivation rec {
license = licenses.asl20; license = licenses.asl20;
homepage = http://kubernetes.io; homepage = http://kubernetes.io;
maintainers = with maintainers; [offline]; maintainers = with maintainers; [offline];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -14188,7 +14188,7 @@ with pkgs;
ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { }; ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { };
kubernetes = callPackage ../applications/networking/cluster/kubernetes { kubernetes = callPackage ../applications/networking/cluster/kubernetes {
go = go_1_6; go = go_1_7;
}; };
lame = callPackage ../development/libraries/lame { }; lame = callPackage ../development/libraries/lame { };