Merged
Conversation
Author
Contributor
diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix
index da32620cf58..7a5d7d4febf 100644
--- a/pkgs/applications/version-management/gh/default.nix
+++ b/pkgs/applications/version-management/gh/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoModule, installShellFiles, testers, gh }:
+{ lib, fetchFromGitHub, buildGoModule, installShellFiles, stdenv, testers, gh }:
buildGoModule rec {
pname = "gh";
@@ -15,27 +15,23 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
- # upstream unsets these to handle cross but it breaks our build
- postPatch = ''
- substituteInPlace Makefile \
- --replace "GOOS= GOARCH= GOARM= GOFLAGS= CGO_ENABLED=" ""
- '';
-
buildPhase = ''
runHook preBuild
- make GO_LDFLAGS="-s -w" GH_VERSION=${version} bin/gh manpages
+ make GO_LDFLAGS="-s -w" GH_VERSION=${version} bin/gh ${lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) "manpages"}
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm755 bin/gh -t $out/bin
+ '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installManPage share/man/*/*.[1-9]
installShellCompletion --cmd gh \
--bash <($out/bin/gh completion -s bash) \
--fish <($out/bin/gh completion -s fish) \
--zsh <($out/bin/gh completion -s zsh)
+ '' + ''
runHook postInstall
'';
|
Author
zowoq
requested changes
Apr 7, 2023
Contributor
zowoq
left a comment
There was a problem hiding this comment.
I think disabling completion and man for cross is fine, please update this to match the diff I posted.
"zowoq" wrote this commit: #225121 (comment)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.