From 7c3d65ec41c09cbb6ee2f8892c759d7fdbb2aba8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 29 Aug 2015 17:48:03 -0500 Subject: [PATCH] qt5Full: build from Qt 5.4 with qtEnv --- pkgs/top-level/all-packages.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 170819dd278..1abac46ab6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7994,13 +7994,11 @@ let qt5 = qt54; - qt5Full = appendToName "full" (qt53.override { - buildDocs = true; - buildExamples = true; - buildTests = true; - developerBuild = true; qtEnv = callPackage ../development/libraries/qt-5/qt-env.nix {}; + qt5Full = appendToName "full" (qtEnv { + qtbase = qt5.base; + paths = lib.filter (x: !(builtins.isFunction x)) (lib.attrValues qt5); }); qt5SDK = qtcreator.override {