From 8746d4b6bc4f784d1910d0a64066e08b5206821d Mon Sep 17 00:00:00 2001 From: wyvie Date: Fri, 12 Sep 2014 17:05:08 +0400 Subject: [PATCH 1/2] Added quazip-0.7 --- pkgs/development/libraries/quazip/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/quazip/default.nix diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix new file mode 100644 index 00000000000..398e942723b --- /dev/null +++ b/pkgs/development/libraries/quazip/default.nix @@ -0,0 +1,23 @@ +{ fetchurl, stdenv, zip, zlib, qt5 }: + +stdenv.mkDerivation rec { + name = "quazip-0.7"; + + src = fetchurl { + url = "mirror://sourceforge/quazip/${name}.tar.gz"; + sha256 = "8af5e7f9bff98b5a2982800a292eae0176c2b41a98a8deab14f4e1cbe07674a4"; + }; + + configurePhase = "cd quazip && qmake quazip.pro"; + + installPhase = "INSTALL_ROOT=$out make install"; + + buildInputs = [ zlib qt5 ]; + + meta = { + description = "A Qt/C++ wrapper for Gilles Vollant's ZIP/UNZIP C package (minizip). Provides access to ZIP archives from Qt programs using QIODevice API."; + license = [ "GPLv2+" ]; + homepage = http://quazip.sourceforge.net/; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7852f255d42..193daf91878 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6143,6 +6143,8 @@ let qoauth = callPackage ../development/libraries/qoauth { }; + quazip = callPackage ../development/libraries/quazip { }; + qt3 = callPackage ../development/libraries/qt-3 { openglSupport = mesaSupported; libpng = libpng12; From 8818e63dcdfb1006f1b3bd375b5a4bbe7f63bf8d Mon Sep 17 00:00:00 2001 From: wyvie Date: Sun, 14 Sep 2014 17:53:12 +0200 Subject: [PATCH 2/2] Fixed quazip default.nix --- pkgs/development/libraries/quazip/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 398e942723b..8899980affa 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { configurePhase = "cd quazip && qmake quazip.pro"; - installPhase = "INSTALL_ROOT=$out make install"; + installFlags = "INSTALL_ROOT=$out"; buildInputs = [ zlib qt5 ]; meta = { - description = "A Qt/C++ wrapper for Gilles Vollant's ZIP/UNZIP C package (minizip). Provides access to ZIP archives from Qt programs using QIODevice API."; - license = [ "GPLv2+" ]; + description = "Provides access to ZIP archives from Qt programs"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://quazip.sourceforge.net/; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = stdenv.lib.platforms.linux; }; }