Merge master into staging-next

2021-01-10 15:50:49 +01:00
parent add2d89082 9f8b7cb4a8
commit 0c42bb5027
57 changed files with 2595 additions and 1404 deletions
--- a/pkgs/development/tools/misc/cflow/default.nix
+++ b/pkgs/development/tools/misc/cflow/default.nix
@@ -45,13 +45,6 @@ stdenv.mkDerivation rec {

    maintainers = [ maintainers.vrthra ];

-    /* On Darwin, build fails with:
-
-       Undefined symbols:
-         "_argp_program_version", referenced from:
-             _argp_program_version$non_lazy_ptr in libcflow.a(argp-parse.o)
-       ld: symbol(s) not found
-     */
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
  };
 }