nix-packaging: buildGoPackage no longer produces the $bin output

DBCDK · May 13, 2020 · f3719f2 · f3719f2
1 parent c66dbfc
commit f3719f2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/nix-packaging/default.nix b/nix-packaging/default.nix
@@ -38,7 +38,7 @@ buildGoPackage rec {
     cp -v $src/data/*.nix $lib
   '';
 
-  outputs = [ "out" "bin" "lib" ];
+  outputs = [ "out" "lib" ];
 
   meta = {
     homepage = "https://github.com/dbcdk/morph";

diff --git a/shell.nix b/shell.nix
@@ -6,9 +6,9 @@ let
   packagingOut = "./nix-packaging";
 
   shellHook = ''
-    if [[ -f ./result-bin/bin/morph ]]; then
+    if [[ -f ./result/bin/morph ]]; then
       if [[ `${which} morph 2>&1 >/dev/null` ]]; then
-        export PATH=$PATH:$(pwd)/result-bin/bin
+        export PATH=$PATH:$(pwd)/result/bin
       fi
       source <(morph --completion-script-bash)
     fi
@@ -38,7 +38,7 @@ let
     outpath="$(readlink -f ${packagingOut})/deps.nix"
 
     ${nix}/bin/nix-build -E 'with import <nixpkgs> {};
-      callPackage ./nix-packaging/default.nix {}' -A bin $@
+      callPackage ./nix-packaging/default.nix {}' -A out $@
 
     make-env
   '';