diff options
| author | Thomas Tuegel <ttuegel@secure.mailbox.org> | 2017-11-08 16:06:38 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-08 16:06:38 -0600 |
| commit | 094d088135769559cfcb61deebcd638c384457e8 (patch) | |
| tree | 444ca50d2e0dcc8c3f859f4d26bc1145fa2aad9b /pkgs/development/libraries/mlt | |
| parent | 94efde51191878091ffe2ffdbbbe1c24f0800cbb (diff) | |
| parent | a8538307e558a646ccbb4bf61f6f1ab3e3bc34d1 (diff) | |
| download | nixpkgs-094d088135769559cfcb61deebcd638c384457e8.tar nixpkgs-094d088135769559cfcb61deebcd638c384457e8.tar.gz nixpkgs-094d088135769559cfcb61deebcd638c384457e8.tar.bz2 nixpkgs-094d088135769559cfcb61deebcd638c384457e8.tar.lz nixpkgs-094d088135769559cfcb61deebcd638c384457e8.tar.xz nixpkgs-094d088135769559cfcb61deebcd638c384457e8.tar.zst nixpkgs-094d088135769559cfcb61deebcd638c384457e8.zip | |
Merge pull request #31357 from ttuegel/qt-5-tmp
Qt 5: revert 5.9.2; remove build temporary directory
Diffstat (limited to 'pkgs/development/libraries/mlt')
| -rw-r--r-- | pkgs/development/libraries/mlt/qt-5.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 35221c91aa7..f3bdc005247 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -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; |