diff options
| author | Martin Milata <martin@martinmilata.cz> | 2020-02-19 23:27:50 +0100 |
|---|---|---|
| committer | Martin Milata <martin@martinmilata.cz> | 2020-02-20 00:55:57 +0100 |
| commit | 80650ae4f0cd38f7305fe0c1bed018350421474c (patch) | |
| tree | 896012d0df84bb2fcf3abed14e3583678e77e8c0 /pkgs/development/libraries | |
| parent | 64e356ac7a3dd5ac3c44858ec5598e3d0cbdfc76 (diff) | |
| download | nixlib-80650ae4f0cd38f7305fe0c1bed018350421474c.tar nixlib-80650ae4f0cd38f7305fe0c1bed018350421474c.tar.gz nixlib-80650ae4f0cd38f7305fe0c1bed018350421474c.tar.bz2 nixlib-80650ae4f0cd38f7305fe0c1bed018350421474c.tar.lz nixlib-80650ae4f0cd38f7305fe0c1bed018350421474c.tar.xz nixlib-80650ae4f0cd38f7305fe0c1bed018350421474c.tar.zst nixlib-80650ae4f0cd38f7305fe0c1bed018350421474c.zip | |
qt5.qtbase: backport cmake macro fix
Backport fix of QT5_MAKE_OUTPUT_FILE CMake macro which causes FreeCAD build failure when building with qt-5.12.7. https://bugreports.qt.io/browse/QTBUG-81715
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.12/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 8d27f3a0d4ba..c0bba5e5c010 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -67,6 +67,13 @@ let ./qtbase.patch.d/0010-qtbase-qtpluginpath.patch ./qtbase.patch.d/0011-qtbase-assert.patch ./qtbase.patch.d/0012-fix-header_module.patch + # https://bugreports.qt.io/browse/QTBUG-81715 + # remove after updating to qt > 5.12.7 + (fetchpatch { + name = "fix-qt5_make_output_file-cmake-macro.patch"; + url = "https://code.qt.io/cgit/qt/qtbase.git/patch/?id=8a3fde00bf53d99e9e4853e8ab97b0e1bcf74915"; + sha256 = "1gpcbdpyazdxnmldvhsf3pfwr2gjvi08x3j6rxf543rq01bp6cpx"; + }) ]; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; |