Merge branch 'staging-next'

Security fixes for a few packages are included.
2018-08-21 15:36:02 +02:00
parent 690a8017de cad8fc3447
commit 765d695b89
196 changed files with 9556 additions and 16487 deletions
@@ -41,6 +41,11 @@ stdenv.mkDerivation rec {
     sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c
  '';

+  preConfigure = ''
+    CC=${stdenv.cc.targetPrefix}cc
+    CXX=${stdenv.cc.targetPrefix}c++
+  '';
+
  configureFlags = [ "--without-kernel-modules" "--without-xmlsecurity" ]
    ++ lib.optional (!withX) "--without-x";