From 758901397b3c6ce971d1b8b3e2c5b8d7d7137238 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 19 Dec 2015 17:25:04 -0600 Subject: [PATCH] qt5LibsFun: build against all Qt 5 versions --- pkgs/top-level/all-packages.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9764ee6e3c5..342f35a55813 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8153,8 +8153,13 @@ let developerBuild = true; }); - qt54 = recurseIntoAttrs (import ../development/libraries/qt-5/5.4 { inherit pkgs; }); - qt55 = recurseIntoAttrs (import ../development/libraries/qt-5/5.5 { inherit pkgs; }); + qt54 = + let imported = import ../development/libraries/qt-5/5.4 { inherit pkgs; }; + in recurseIntoAttrs (imported.override (super: qt5LibsFun)); + + qt55 = + let imported = import ../development/libraries/qt-5/5.5 { inherit pkgs; }; + in recurseIntoAttrs (imported.override (super: qt5LibsFun)); qt5 = qt54;