Merge master into staging-next

2020-02-05 10:28:52 +01:00
parent 080f1e7f5c 2b3d2dbaf9
commit 76a439239e
156 changed files with 1607 additions and 1504 deletions
@@ -194,7 +194,7 @@ server = stdenv.mkDerivation (common // {

  # perlPackages.DBDmysql is broken on darwin
  postFixup = optionalString (!stdenv.hostPlatform.isDarwin) ''
-    wrapProgram $out/bin/mytop --set PATH ${less}/bin/less
+    wrapProgram $out/bin/mytop --set PATH ${makeBinPath [ less ncurses ]}
  '';

  CXXFLAGS = optionalString stdenv.hostPlatform.isi686 "-fpermissive";