diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-04-14 09:50:48 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-04-14 09:53:21 +0200 |
| commit | d5d94127fd6468febe4f5e8eba8cb231bbd56103 (patch) | |
| tree | 53efc69e691bdf7c7415039f5cdddb90d8fb5fc4 /pkgs/tools/networking/assh | |
| parent | 43c910047f4f2882cf9cba1d38045c3f6ebee051 (diff) | |
| parent | 069038f0931658e6030876f37f81dfb6825f884c (diff) | |
Merge branch 'staging-next' into staging
Minor conflicts; I hope I didn't mess up: pkgs/development/tools/misc/binutils/default.nix pkgs/games/openjk/default.nix
Diffstat (limited to 'pkgs/tools/networking/assh')
| -rw-r--r-- | pkgs/tools/networking/assh/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index 0d3b08ae478aa..a52e9bf004442 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -1,8 +1,10 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , openssh , makeWrapper +, ps }: buildGoModule rec { @@ -18,14 +20,14 @@ buildGoModule rec { vendorSha256 = "sha256-xLsiYM0gZL5O+Y3IkiMmzJReNW7XFN3Xejz2CkCqp5M="; - doCheck = false; - ldflags = [ "-s" "-w" "-X moul.io/assh/v2/pkg/version.Version=${version}" ]; nativeBuildInputs = [ makeWrapper ]; + checkInputs = lib.optionals stdenv.isDarwin [ ps ]; + postInstall = '' wrapProgram "$out/bin/assh" \ --prefix PATH : ${openssh}/bin |