quazip_qt4: add as a separate derivation

This commit is contained in:
Nikolay Amiantov 2016-04-30 15:53:12 +03:00
parent 1573bde049
commit cf34a7be4a

View File

@ -3174,9 +3174,11 @@ in
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 = qt5.quazip.override { qt = qt4; qmakeHook = qmake4Hook; }; quazip = quazip_qt4;
}; };
quazip_qt4 = self.qt5.quazip.override { qt = qt4; qmakeHook = qmake4Hook; };
scrot = callPackage ../tools/graphics/scrot { }; scrot = callPackage ../tools/graphics/scrot { };
scrypt = callPackage ../tools/security/scrypt { }; scrypt = callPackage ../tools/security/scrypt { };
@ -14129,7 +14131,7 @@ in
enableXMPP = config.tomahawk.enableXMPP or true; enableXMPP = config.tomahawk.enableXMPP or true;
enableKDE = config.tomahawk.enableKDE or false; enableKDE = config.tomahawk.enableKDE or false;
enableTelepathy = config.tomahawk.enableTelepathy or false; enableTelepathy = config.tomahawk.enableTelepathy or false;
quazip = qt5.quazip.override { qt = qt4; }; quazip = quazip_qt4;
}; };
torchPackages = recurseIntoAttrs ( callPackage ../applications/science/machine-learning/torch { torchPackages = recurseIntoAttrs ( callPackage ../applications/science/machine-learning/torch {