diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-05-06 08:12:40 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-05-06 08:20:05 +0200 |
| commit | 54eb2d10184124a8bd6cc01ff815c30aa8aebf35 (patch) | |
| tree | 2152ad58471446689a35e1466ef865baac1f8964 /pkgs/servers/sql | |
| parent | ee8cde8d1cc4faea6502ffac90af20bfe86328a2 (diff) | |
| parent | 1906fc5bd10a7bbab35136325fa3251a043361b2 (diff) | |
| download | nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.gz nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.bz2 nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.lz nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.xz nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.zst nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.zip | |
Merge branch 'staging-next'
Status on Hydra for linuxes seems good enough: https://hydra.nixos.org/eval/1585703?filter=linux&compare=1585482&full=#tabs-now-fail
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/cockroachdb/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index fb62ee584742..2ce8e901e867 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -42,7 +42,7 @@ buildGoPackage rec { installPhase = '' runHook preInstall - install -D cockroachoss $bin/bin/cockroach + install -D cockroachoss $out/bin/cockroach installShellCompletion cockroach.bash mkdir -p $man/share/man @@ -51,11 +51,7 @@ buildGoPackage rec { runHook postInstall ''; - # Unfortunately we have to keep an empty reference to $out, because it seems - # buildGoPackages only nukes references to the go compiler under $bin, effectively - # making all binary output under $bin mandatory. Ideally, we would just use - # $out and $man and remove $bin since there's no point in an empty path. :( - outputs = [ "bin" "man" "out" ]; + outputs = [ "out" "man" ]; meta = with stdenv.lib; { homepage = "https://www.cockroachlabs.com"; |