Merge branch 'staging-next'

This round is without the systemd CVE, as we don't have binaries for that yet. BTW, I just ignore darwin binaries these days, as I'd have to wait for weeks for them.
2019-02-20 09:38:45 +01:00
parent 28d983fe25 e20188f181
commit 32767d139f
340 changed files with 8459 additions and 2626 deletions
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

  preConfigure =
    ''
-      substituteInPlace foomaticrip.c --replace /bin/bash /bin/sh
+      substituteInPlace foomaticrip.c --replace /bin/bash ${stdenv.shell}
    '';

  installTargets = "install-cups";