Merge branch 'master' into closure-size

TODO: there was more significant refactoring of qtbase and plasma 5.5 on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
parent bbcf127c7c 468f698f60
commit f9f6f41bff
951 changed files with 117997 additions and 19014 deletions
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
      "--with-logfile=/var/log/net-snmpd.log"
      "--with-persistent-directory=/var/lib/net-snmp"
      "--with-openssl=${openssl}"
-    ];
+    ] ++ stdenv.lib.optional stdenv.isLinux "--with-mnttab=/proc/mounts";

  buildInputs = [ autoreconfHook file perl unzip openssl ];