From 3f3d33a07867116446ec9b5e2675ef1c8de8127d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 15 May 2017 06:44:33 -0500 Subject: qt5: use distinct `lib/qt-5.x` prefix for each minor version Using a distinct prefix for plugins and QML libraries allows multiple Qt 5 minor versions to coexist in the same environment. --- pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries/kde-frameworks/kwindowsystem') diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index 8a91bdbac52..4e02777e39c 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -14,6 +14,6 @@ kdeFramework { propagatedBuildInputs = [ qtx11extras ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); preConfigure = '' - NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"$out/lib/qt5/plugins\"" + NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"$out/$qtPluginPrefix\"" ''; } -- cgit 1.4.1