treewide: use $out instead of $bin with buildGoPackage

2020-04-28 20:30:29 +10:00
parent c59c4e3589
commit b5dc07a4b4
88 changed files with 153 additions and 164 deletions
@@ -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
  '';

@@ -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;
@@ -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"
  '';

@@ -29,7 +29,7 @@ buildGoPackage rec {

  doInstallCheck = true;
  installCheckPhase = ''
-    export PATH=$PATH:$bin/bin
+    export PATH=$PATH:$out/bin

    pushgateway --help