quazip: Qt 5 infrastructure update

+6 -6
+1 -1
pkgs/development/libraries/quazip/default.nix
··· 12 12 13 13 installFlags = "INSTALL_ROOT=$(out)"; 14 14 15 - buildInputs = [ zlib (qt.base or qt) ]; 15 + buildInputs = [ zlib qt ]; 16 16 17 17 meta = { 18 18 description = "Provides access to ZIP archives from Qt programs";
+5 -5
pkgs/top-level/all-packages.nix
··· 2992 2992 screen-message = callPackage ../tools/X11/screen-message { }; 2993 2993 2994 2994 screencloud = callPackage ../applications/graphics/screencloud { 2995 - quazip = quazip.override { qt = qt4; }; 2995 + quazip = qt5.quazip.override { qt = qt4; }; 2996 2996 }; 2997 2997 2998 2998 scrot = callPackage ../tools/graphics/scrot { }; ··· 8112 8112 8113 8113 qoauth = callPackage ../development/libraries/qoauth { }; 8114 8114 8115 - quazip = callPackage ../development/libraries/quazip { 8116 - qt = qt5; 8117 - }; 8118 - 8119 8115 qt3 = callPackage ../development/libraries/qt-3 { 8120 8116 openglSupport = mesaSupported; 8121 8117 libpng = libpng12; ··· 8183 8179 8184 8180 qtcreator = callPackage ../development/qtcreator { 8185 8181 withDocumentation = true; 8182 + }; 8183 + 8184 + quazip = callPackage ../development/libraries/quazip { 8185 + qt = qtbase; 8186 8186 }; 8187 8187 8188 8188 qwt = callPackage ../development/libraries/qwt/6.nix { };