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
@@ -28,10 +28,7 @@ stdenv.mkDerivation rec {
  propagatedBuildInputs = [ gmp ];

  patchPhase = "patchShebangs ./z_pp.pl";
-
  configurePhase = ''
-    CC=${stdenv.cc.targetPrefix}cc
-    CXX=${stdenv.cc.targetPrefix}c++
    ./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib
  '';
  preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib";