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/servers/monitoring/prometheus | |
| parent | c59c4e358989ce49afd177e6899549fbb8f8bf7f (diff) | |
| download | nixlib-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/monitoring/prometheus')
4 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 9074c19e1091..9402fa44eed2 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -27,7 +27,7 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - $bin/bin/amtool --completion-script-bash > amtool.bash + $out/bin/amtool --completion-script-bash > amtool.bash installShellCompletion amtool.bash ''; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index e43e625e449d..28b76234dd8d 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -54,9 +54,9 @@ in buildGoPackage rec { ''; preInstall = '' - mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus" - cp -a $src/documentation/* $bin/share/doc/prometheus - cp -a $src/console_libraries $src/consoles $bin/etc/prometheus + mkdir -p "$out/share/doc/prometheus" "$out/etc/prometheus" + cp -a $src/documentation/* $out/share/doc/prometheus + cp -a $src/console_libraries $src/consoles $out/etc/prometheus ''; doCheck = true; diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 8202a8c8c29f..b5a933432524 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -43,7 +43,7 @@ buildGoPackage rec { ]; postInstall = optionalString withSystemdSupport '' - wrapProgram $bin/bin/postfix_exporter \ + wrapProgram $out/bin/postfix_exporter \ --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" ''; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 0cb41f099c67..1425fccdca4b 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -29,7 +29,7 @@ buildGoPackage rec { doInstallCheck = true; installCheckPhase = '' - export PATH=$PATH:$bin/bin + export PATH=$PATH:$out/bin pushgateway --help |