Merge commit staging+systemd into closure-size

Many non-conflict problems weren't (fully) resolved in this commit yet.

pkgs/applications/misc/audio/soxr/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "soxr-0.1.1";
+  name = "soxr-0.1.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/soxr/${name}-Source.tar.xz";
-    sha256 = "1hmadwqfpg15vhwq9pa1sl5xslibrjpk6hpq2s9hfmx1s5l6ihfw";
+    sha256 = "0xf2w3piwz9gfr1xqyrj4k685q5dy53kq3igv663i4f4y4sg9rjl";
   };
 
   preConfigure = if stdenv.isDarwin then ''
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
     export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/build/src
   '';
 
-  buildInputs = [ cmake (stdenv.cc.cc.lib or null) ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ (stdenv.cc.cc.lib or null) ];
   # outputs TODO: gcc.lib might become a problem;
   # here -out/lib/*.a got found and -lib/lib/*.so didn't