Merge branch 'staging'

Includes libX11 security update.
2018-08-24 09:19:43 +02:00
parent 8987547106 e78fd23564
commit 7db611f2af
49 changed files with 189 additions and 160 deletions
@@ -41,11 +41,6 @@ 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";