swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

quazip: Use qt instead of qt5 for refering to Qt.

Browse source 
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>
This commit is contained in:
aszlig 2014-11-17 01:06:02 +01:00
parent fdd9d132ca
commit b2557476f7
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/quazip/default.nix
View file

@ -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";

4
pkgs/top-level/all-packages.nix
View file

@ -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;