public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

quazip: move to qmakeHook

Browse Source 
This reverts commit d663b3df24b709fd972525ab73855843ff35d09d.
This commit is contained in:
Nikolay Amiantov 2016-04-16 23:01:40 +03:00
parent 1875538730
commit 82af8640e3
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/quazip/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, zip, zlib, qt }: { fetchurl, stdenv, zip, zlib, qt, qmakeHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "quazip-0.7.1"; name = "quazip-0.7.1";
@ -8,15 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "1pijy6zn8kdx9m6wrckid24vkgp250hklbpmgrpixiam6l889jbq"; sha256 = "1pijy6zn8kdx9m6wrckid24vkgp250hklbpmgrpixiam6l889jbq";
}; };
configurePhase = '' preConfigure = "cd quazip";
runHook preConfigure
cd quazip && qmake quazip.pro
runHook postConfigure
'';
installFlags = "INSTALL_ROOT=$(out)";
buildInputs = [ zlib qt ]; buildInputs = [ zlib qt ];
nativeBuildInputs = [ qmakeHook ];
meta = { meta = {
description = "Provides access to ZIP archives from Qt programs"; description = "Provides access to ZIP archives from Qt programs";

2
pkgs/top-level/all-packages.nix
View File

@ -3143,7 +3143,7 @@ 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; }; quazip = qt5.quazip.override { qt = qt4; qmakeHook = qmake4Hook; };
}; };
scrot = callPackage ../tools/graphics/scrot { }; scrot = callPackage ../tools/graphics/scrot { };