Merge branch 'staging-next'

Status on Hydra for linuxes seems good enough: https://hydra.nixos.org/eval/1585703?filter=linux&compare=1585482&full=#tabs-now-fail
2020-05-06 08:20:05 +02:00
parent ee8cde8d1c 1906fc5bd1
commit 54eb2d1018
177 changed files with 652 additions and 531 deletions
@@ -29,8 +29,8 @@ buildGoPackage rec {
  '';

  installPhase = ''
-    mkdir -pv $bin/bin
-    cp -v dcrwallet $bin/bin
+    mkdir -pv $out/bin
+    cp -v dcrwallet $out/bin
  '';


@@ -21,8 +21,8 @@ buildGoPackage rec {
  '';

  installPhase = ''
-    mkdir -pv $bin/bin
-    cp -v build/bin/geth build/bin/bootnode build/bin/swarm $bin/bin
+    mkdir -pv $out/bin
+    cp -v build/bin/geth build/bin/bootnode build/bin/swarm $out/bin
  '';

  meta = with stdenv.lib; {