about summary refs log tree commit diff
path: root/pkgs/servers/sql
diff options
context:
space:
mode:
authorzowoq <59103226+zowoq@users.noreply.github.com>2020-04-28 11:50:57 +1000
committerzowoq <59103226+zowoq@users.noreply.github.com>2020-04-28 20:30:29 +1000
commitb5dc07a4b471e6f651af3b13e4bd841b6b3ea6ed (patch)
tree77df5bd7e3c972e12a022ca5fc437c8f67ce9092 /pkgs/servers/sql
parentc59c4e358989ce49afd177e6899549fbb8f8bf7f (diff)
downloadnixlib-b5dc07a4b471e6f651af3b13e4bd841b6b3ea6ed.tar
nixlib-b5dc07a4b471e6f651af3b13e4bd841b6b3ea6ed.tar.gz
nixlib-b5dc07a4b471e6f651af3b13e4bd841b6b3ea6ed.tar.bz2
nixlib-b5dc07a4b471e6f651af3b13e4bd841b6b3ea6ed.tar.lz
nixlib-b5dc07a4b471e6f651af3b13e4bd841b6b3ea6ed.tar.xz
nixlib-b5dc07a4b471e6f651af3b13e4bd841b6b3ea6ed.tar.zst
nixlib-b5dc07a4b471e6f651af3b13e4bd841b6b3ea6ed.zip
treewide: use $out instead of $bin with buildGoPackage
Diffstat (limited to 'pkgs/servers/sql')
-rw-r--r--pkgs/servers/sql/cockroachdb/default.nix8
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";