diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix
index 4bb24427b9f..9b1324d1137 100644
--- a/pkgs/development/libraries/qt-5/5.4/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/default.nix
@@ -101,6 +101,14 @@ let
       qtx11extras = callPackage ./qtx11extras.nix {};
       qtxmlpatterns = callPackage ./qtxmlpatterns.nix {};
 
+      env = callPackage ../qt-env.nix {};
+      full = env "qt-${qtbase.version}" [
+        qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats
+        qtlocation qtmultimedia qtquick1 qtquickcontrols qtscript qtsensors qtserialport
+        qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtwebsockets qtx11extras
+        qtxmlpatterns
+      ];
+
       makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;
 
     };
diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index 4bb24427b9f..9b1324d1137 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -101,6 +101,14 @@ let
       qtx11extras = callPackage ./qtx11extras.nix {};
       qtxmlpatterns = callPackage ./qtxmlpatterns.nix {};
 
+      env = callPackage ../qt-env.nix {};
+      full = env "qt-${qtbase.version}" [
+        qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats
+        qtlocation qtmultimedia qtquick1 qtquickcontrols qtscript qtsensors qtserialport
+        qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtwebsockets qtx11extras
+        qtxmlpatterns
+      ];
+
       makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;
 
     };
diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix
index e6973015aca..11c6ac74d5f 100644
--- a/pkgs/development/libraries/qt-5/qt-env.nix
+++ b/pkgs/development/libraries/qt-5/qt-env.nix
@@ -1,8 +1,6 @@
-{ runCommand, lndir }:
+{ runCommand, lndir, qtbase }: name: paths:
 
-{ paths, qtbase }:
-
-runCommand "qt-env" { inherit paths qtbase; } ''
+runCommand name { inherit paths qtbase; } ''
 
 mkdir -p "$out/bin" "$out/mkspecs" "$out/include" "$out/lib" "$out/share"
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f937ef729c9..bd92967d79d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8205,12 +8205,8 @@ let
   qt55Libs = lib.makeScope qt55.newScope qt5LibsFun;
   qt5Libs = qt55Libs;
 
-  qtEnv = callPackage ../development/libraries/qt-5/qt-env.nix {};
-
-  qt5Full = appendToName "full" (qtEnv {
-    qtbase = qt5.base;
-    paths = lib.filter lib.isDerivation (lib.attrValues qt5);
-  });
+  qtEnv = qt5.env;
+  qt5Full = qt5.full;
 
   qtcreator = callPackage ../development/qtcreator {
     qtLib = qt54;