Merge pull request #31357 from ttuegel/qt-5-tmp

Qt 5: revert 5.9.2; remove build temporary directory
This commit is contained in:
Thomas Tuegel
2017-11-08 16:06:38 -06:00
committed by GitHub
106 changed files with 3269 additions and 2152 deletions

View File

@@ -3,6 +3,8 @@
, fftw, vid-stab, opencv3, ladspa-sdk
}:
let inherit (stdenv.lib) getDev; in
stdenv.mkDerivation rec {
name = "mlt-${version}";
version = "6.4.1";
@@ -39,6 +41,10 @@ stdenv.mkDerivation rec {
"--enable-opengl"
];
# mlt is unable to cope with our multi-prefix Qt build
# because it does not use CMake or qmake.
NIX_CFLAGS_COMPILE = [ "-I${getDev qtsvg}/include/QtSvg" ];
CXXFLAGS = "-std=c++11";
enableParallelBuilding = true;