From 019a23db3e242eceafb5b24f74c0af1be7a74eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 14 Aug 2015 10:09:17 +0200 Subject: [PATCH] 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. --- pkgs/development/libraries/qt-5/5.3/default.nix | 1 + pkgs/development/libraries/qt-5/5.4/qtbase.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index 8a08c952bba..7f4e0b60c2d 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -87,6 +87,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" export MAKEFLAGS=-j$NIX_BUILD_CORES export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml" + export configureFlags+=" -docdir $out/share/doc/qt5" ''; prefixKey = "-prefix "; diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix index 780f1b60f7c..6ec57787e22 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation { sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml" + export configureFlags+=" -docdir $out/share/doc/qt5" ''; prefixKey = "-prefix ";