From 0b059cc9561672215c178ccd02f97fd7bf2308f8 Mon Sep 17 00:00:00 2001
From: Florian Franzen <Florian.Franzen@gmail.com>
Date: Sat, 9 Mar 2019 20:46:23 +0100
Subject: qtbase: Fix paths returned by qmake -query

---
 pkgs/development/libraries/qt-5/modules/qtbase.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'pkgs/development/libraries/qt-5/modules')

diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 92ac8a242013..b3d12fcea46e 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -175,7 +175,7 @@ stdenv.mkDerivation {
     NIX_OUTPUT_BIN = $bin
     NIX_OUTPUT_DEV = $dev
     NIX_OUTPUT_OUT = $out
-    NIX_OUTPUT_DOC = $dev/$qtDocPrefix
+    NIX_OUTPUT_DOC = $out/$qtDocPrefix
     NIX_OUTPUT_QML = $bin/$qtQmlPrefix
     NIX_OUTPUT_PLUGIN = $bin/$qtPluginPrefix
     EOF
@@ -376,6 +376,18 @@ 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.)
         ''
-- 
cgit 1.4.1