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:12:40 +02:00
parent ee8cde8d1c 1906fc5bd1
commit 54eb2d1018
177 changed files with 652 additions and 531 deletions
--- a/pkgs/tools/system/localtime/default.nix
+++ b/pkgs/tools/system/localtime/default.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {

  makeFlags = [
    "PREFIX=${placeholder "out"}"
-    "BINDIR=${placeholder "bin"}/bin"
+    "BINDIR=${placeholder "out"}/bin"
  ];

  buildPhase = ''