public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

quazip: Qt 5 infrastructure update

Browse Source
This commit is contained in:
Thomas Tuegel 2015-12-19 22:04:55 -06:00
parent 538ce57feb
commit 1d331481fc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/quazip/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
installFlags = "INSTALL_ROOT=$(out)"; installFlags = "INSTALL_ROOT=$(out)";
buildInputs = [ zlib (qt.base or qt) ]; buildInputs = [ zlib qt ];
meta = { meta = {
description = "Provides access to ZIP archives from Qt programs"; description = "Provides access to ZIP archives from Qt programs";

10
pkgs/top-level/all-packages.nix
View File

@ -2992,7 +2992,7 @@ let
screen-message = callPackage ../tools/X11/screen-message { }; screen-message = callPackage ../tools/X11/screen-message { };
screencloud = callPackage ../applications/graphics/screencloud { screencloud = callPackage ../applications/graphics/screencloud {
quazip = quazip.override { qt = qt4; }; quazip = qt5.quazip.override { qt = qt4; };
}; };
scrot = callPackage ../tools/graphics/scrot { }; scrot = callPackage ../tools/graphics/scrot { };
@ -8112,10 +8112,6 @@ let
qoauth = callPackage ../development/libraries/qoauth { }; qoauth = callPackage ../development/libraries/qoauth { };
quazip = callPackage ../development/libraries/quazip {
qt = qt5;
};
qt3 = callPackage ../development/libraries/qt-3 { qt3 = callPackage ../development/libraries/qt-3 {
openglSupport = mesaSupported; openglSupport = mesaSupported;
libpng = libpng12; libpng = libpng12;
@ -8185,6 +8181,10 @@ let
withDocumentation = true; withDocumentation = true;
}; };
quazip = callPackage ../development/libraries/quazip {
qt = qtbase;
};
qwt = callPackage ../development/libraries/qwt/6.nix { }; qwt = callPackage ../development/libraries/qwt/6.nix { };
signon = callPackage ../development/libraries/signon { }; signon = callPackage ../development/libraries/signon { };