pyrox.dev / nixpkgs
lol
fork atom

qt5: specify docdir

Due to a bug somewhere, the qt documentation is by default placed in
$out/share/doc although "qmake -query" reports $out/doc. That
discrepancy causes qtcreator withDocumentation builds to fail. This
fixes it.

Bjørn Forsman 019a23db c2a8e5e6

+2
unified split
+1
pkgs/development/libraries/qt-5/5.3/default.nix
··· 87 export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" 88 export MAKEFLAGS=-j$NIX_BUILD_CORES 89 export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml" 90 ''; 91 92 prefixKey = "-prefix ";
··· 87 export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" 88 export MAKEFLAGS=-j$NIX_BUILD_CORES 89 export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml" 90 + export configureFlags+=" -docdir $out/share/doc/qt5" 91 ''; 92 93 prefixKey = "-prefix ";
+1
pkgs/development/libraries/qt-5/5.4/qtbase.nix
··· 84 sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" 85 86 export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml" 87 ''; 88 89 prefixKey = "-prefix ";
··· 84 sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" 85 86 export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml" 87 + export configureFlags+=" -docdir $out/share/doc/qt5" 88 ''; 89 90 prefixKey = "-prefix ";