dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #21069 from offlinehacker/pkgs/kubernetes/docfix

Browse Source 
kubernetes: generate docs, fix empty man files
This commit is contained in:
Jaka Hudoklin 2016-12-17 15:36:47 +01:00 committed by GitHub
commit 2319781469
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,16 +28,23 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper which go rsync go-bindata ]; buildInputs = [ makeWrapper which go rsync go-bindata ];
outputs = ["out" "man""pause"]; outputs = ["out" "man" "pause"];
postPatch = '' postPatch = ''
substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" substituteInPlace "hack/lib/golang.sh" --replace "_cgo" ""
substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}"
substituteInPlace "hack/update-munge-docs.sh" --replace "make" "make SHELL=${stdenv.shell}"
substituteInPlace "hack/update-munge-docs.sh" --replace "kube::util::git_upstream_remote_name" "echo origin"
patchShebangs ./hack patchShebangs ./hack
''; '';
WHAT="--use_go_build ${concatStringsSep " " components}"; WHAT="--use_go_build ${concatStringsSep " " components}";
postBuild = "(cd build/pause && gcc pause.c -o pause)"; postBuild = ''
./hack/generate-docs.sh
(cd build/pause && gcc pause.c -o pause)
'';
installPhase = '' installPhase = ''
mkdir -p "$out/bin" "$man/share/man" "$pause/bin" mkdir -p "$out/bin" "$man/share/man" "$pause/bin"