From c384ad46b83af5afabdea73cf13164fde352d1e7 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 27 Sep 2017 03:10:16 +0300
Subject: [PATCH] qtbase: Make some output references more explicit

---
 pkgs/development/qtcreator/default.nix | 2 +-
 pkgs/games/qgo/default.nix             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index 494b5ec30e6e..fdf1745f9f2c 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs";
 
   preBuild = optional withDocumentation ''
-    ln -s ${qtbase}/$qtDocPrefix $NIX_QT5_TMP/share
+    ln -s ${getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share
   '';
 
   postInstall = ''
diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix
index dea0fe547da0..4848d1a3e215 100644
--- a/pkgs/games/qgo/default.nix
+++ b/pkgs/games/qgo/default.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
     # libQt5XcbQpa is a platform plugin dependency and doesn't get linked
     patchelf --add-needed libQt5XcbQpa.so.5 $out/bin/qgo
     wrapProgram $out/bin/qgo \
-      --set QT_QPA_PLATFORM_PLUGIN_PATH "${qt56.qtbase}/lib/qt-5.6/plugins/platforms/"
+      --set QT_QPA_PLATFORM_PLUGIN_PATH "${stdenv.lib.getBin qt56.qtbase}/lib/qt-5.6/plugins/platforms/"
   '';
 }