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

Merge pull request #52519 from risicle/ris-cf-cli-platforms

Browse Source 
cloudfoundry-cli: fix build on multiple platforms, notably darwin. also bump -> 6.41.0
This commit is contained in:
Jörg Thalheim 2018-12-21 13:28:45 +01:00 committed by GitHub
commit 3d6e86f77e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/tools/cloudfoundry-cli/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec { buildGoPackage rec {
name = "cloudfoundry-cli-${version}"; name = "cloudfoundry-cli-${version}";
version = "6.37.0"; version = "6.41.0";
goPackagePath = "code.cloudfoundry.org/cli"; goPackagePath = "code.cloudfoundry.org/cli";
@ -12,20 +12,28 @@ buildGoPackage rec {
owner = "cloudfoundry"; owner = "cloudfoundry";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "1v4f1fyydpzkfir46g4ppbf3zmk3ym6kxswpkdjls8h3dbb2fbnv"; sha256 = "1dkd0lfq55qpnxsrigffaqm2nlcxr0bm0jsl4rsjlmb8p2vgpx8b";
}; };
outputs = [ "out" ]; makeTarget = let hps = stdenv.hostPlatform.system; in
if hps == "x86_64-darwin" then
"out/cf-cli_osx"
else if hps == "x86_64-linux" then
"out/cf-cli_linux_x86-64"
else if hps == "i686-linux" then
"out/cf-cli_linux_i686"
else
throw "make target for this platform unknown";
buildPhase = '' buildPhase = ''
cd go/src/${goPackagePath} cd go/src/${goPackagePath}
CF_BUILD_DATE="1970-01-01" make build CF_BUILD_DATE="1970-01-01" make $makeTarget
cp $makeTarget out/cf
''; '';
installPhase = '' installPhase = ''
install -Dm555 out/cf "$out/bin/cf" install -Dm555 out/cf "$bin/bin/cf"
remove-references-to -t ${go} "$out/bin/cf" install -Dm444 -t "$bin/share/bash-completion/completions/" "$src/ci/installers/completion/cf"
install -Dm444 -t "$out/share/bash-completion/completions/" "$src/ci/installers/completion/cf"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -33,5 +41,6 @@ buildGoPackage rec {
homepage = https://github.com/cloudfoundry/cli; homepage = https://github.com/cloudfoundry/cli;
maintainers = with maintainers; [ ris ]; maintainers = with maintainers; [ ris ];
license = licenses.asl20; license = licenses.asl20;
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
}; };
} }