Merge branch 'master' into staging

2018-03-24 01:34:53 -04:00
parent 5d116251db 34087d0dec
commit 0f854cd2d1
141 changed files with 2752 additions and 1454 deletions
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ cmake ninja pkgconfig ];

+  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
+
  cmakeFlags = [
    (mkFlag true "XPDF_HEADERS")
    (mkFlag (!minimal) "GLIB")