Merge pull request #31357 from ttuegel/qt-5-tmp
Qt 5: revert 5.9.2; remove build temporary directory
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user