Merge remote-tracking branch 'origin/master' into staging

2019-01-10 16:00:34 +01:00
parent 52a12dacf9 2f1e8d40cf
commit 237deba4e7
281 changed files with 16988 additions and 13353 deletions
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {

  hardeningDisable = [ "format" ];

+  NIX_LDFLAGS = [
+    "-lm"
+  ];
+
  meta = with stdenv.lib; {
    homepage = http://gdmap.sourceforge.net;
    description = "Recursive rectangle map of disk usage";