From b2557476f75f408eac2a1c9d02ad07ea94c7d59e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 17 Nov 2014 01:06:02 +0100
Subject: [PATCH] quazip: Use qt instead of qt5 for refering to Qt.

Qt 5 is passed via all-packages.nix, so it doesn't look too odd if you
want to build against qt4 instead. Before you'd have to use something
like:

quazip.override { qt5 = qt4; }

Now, it is:

quazip.override { qt = qt4; }

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/quazip/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix               | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix
index 9eb068bebb0..7b1e70e0eed 100644
--- a/pkgs/development/libraries/quazip/default.nix
+++ b/pkgs/development/libraries/quazip/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, zip, zlib, qt5 }:
+{ fetchurl, stdenv, zip, zlib, qt }:
 
 stdenv.mkDerivation rec {
   name = "quazip-0.7";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   installFlags = "INSTALL_ROOT=$(out)";
 
-  buildInputs = [ zlib qt5 ];
+  buildInputs = [ zlib qt ];
 
   meta = {
     description = "Provides access to ZIP archives from Qt programs";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22be1d18368..1c9fa640e50 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6591,7 +6591,9 @@ let
 
   qoauth = callPackage ../development/libraries/qoauth { };
 
-  quazip = callPackage ../development/libraries/quazip { };
+  quazip = callPackage ../development/libraries/quazip {
+    qt = qt5;
+  };
 
   qt3 = callPackage ../development/libraries/qt-3 {
     openglSupport = mesaSupported;