diff options
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtbase.nix | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index a1c3bea866e2..8506a80ddf3f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation { NIX_OUTPUT_BIN = $bin NIX_OUTPUT_DEV = $dev NIX_OUTPUT_OUT = $out - NIX_OUTPUT_DOC = $out/$qtDocPrefix + NIX_OUTPUT_DOC = $dev/$qtDocPrefix NIX_OUTPUT_QML = $bin/$qtQmlPrefix NIX_OUTPUT_PLUGIN = $bin/$qtPluginPrefix EOF @@ -387,18 +387,6 @@ stdenv.mkDerivation { moveToOutput bin "$dev" '' - # Fix paths returned by qmake -query - + '' - cat > $dev/bin/qt.conf <<EOF - [Paths] - Prefix = $out - Headers = $dev/include - Plugins = $bin/$qtPluginPrefix - Documentation = $out/$qtDocPrefix - HostBinaries = $dev/bin - EOF - '' - + ( # fixup .pc file (where to find 'moc' etc.) '' |