diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-04-28 11:50:57 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-04-28 20:30:29 +1000 |
| commit | b5dc07a4b471e6f651af3b13e4bd841b6b3ea6ed (patch) | |
| tree | 77df5bd7e3c972e12a022ca5fc437c8f67ce9092 /pkgs/applications/version-management/gitlab | |
| parent | c59c4e358989ce49afd177e6899549fbb8f8bf7f (diff) | |
treewide: use $out instead of $bin with buildGoPackage
Diffstat (limited to 'pkgs/applications/version-management/gitlab')
| -rw-r--r-- | pkgs/applications/version-management/gitlab/gitaly/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/version-management/gitlab/gitlab-shell/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 968b26632c72d..37a2fc23af0ff 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -65,7 +65,7 @@ in buildGoPackage rec { "'/run/gitlab/shell-config.yml'" ''; - outputs = [ "bin" "out" "ruby" ]; + outputs = [ "out" "ruby" ]; meta = with stdenv.lib; { homepage = "https://gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 40860b13e4dc4..2b4fddaa9c84e 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -18,8 +18,8 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $bin/bin - cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $bin/ + cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $out/bin + cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $out/ ''; meta = with stdenv.lib; { |