Merge branch 'master' of https://github.com/NixOS/nixpkgs into php-mysqlnd-m

2017-11-07 14:01:39 -08:00
parent 41cd4f2459 80ae60a34b
commit 24c6407883
154 changed files with 2856 additions and 1481 deletions
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -22,10 +22,12 @@ let

      enableParallelBuilding = true;

-  nativeBuildInputs = [ pkgconfig ];
+      nativeBuildInputs = [ pkgconfig ];
      buildInputs = [ flex bison ]
        ++ lib.optional stdenv.isLinux systemd;

+      CXXFLAGS = lib.optional stdenv.cc.isClang "-std=c++11";
+
      flags = {

        # much left to do here...