Merge branch 'master' into staging

pkgs/tools/system/collectd/default.nix

@@ -52,7 +52,8 @@ stdenv.mkDerivation rec {
     stdenv.lib.optional (libsigrok != null) "--with-libsigrok" ++
     stdenv.lib.optional (python != null) "--with-python=${python}/bin/python";
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
+  # Fix build on Glibc 2.24.
+  NIX_CFLAGS_COMPILE = "-Wno-error=cpp -Wno-error=deprecated-declarations";
 
   meta = with stdenv.lib; {
     description = "Daemon which collects system performance statistics periodically";

pkgs/tools/system/wsmancli/default.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     ./bootstrap
 
     configureFlagsArray=(
-      LIBS="-L${openssl}/lib -lssl -lcrypto"
+      LIBS="-L${openssl.out}/lib -lssl -lcrypto"
     )
   '';