From cf34a7be4a513eb3f99c9474df9d7b16b43b486a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 30 Apr 2016 15:53:12 +0300 Subject: [PATCH] quazip_qt4: add as a separate derivation --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 586248d04ee..a0cf2dab0d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3174,9 +3174,11 @@ in screen-message = callPackage ../tools/X11/screen-message { }; 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 { }; scrypt = callPackage ../tools/security/scrypt { }; @@ -14129,7 +14131,7 @@ in enableXMPP = config.tomahawk.enableXMPP or true; enableKDE = config.tomahawk.enableKDE 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 {