diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-16 23:01:40 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:52 +0300 |
| commit | 82af8640e36c4b37ff3034f3a410334aa6f19caf (patch) | |
| tree | b7efcf14d32ae1b6bba9c0b0326cccb68cc817e1 | |
| parent | 1875538730d44eda2d078498a5f53ee61fbb1daa (diff) | |
| download | nixlib-82af8640e36c4b37ff3034f3a410334aa6f19caf.tar nixlib-82af8640e36c4b37ff3034f3a410334aa6f19caf.tar.gz nixlib-82af8640e36c4b37ff3034f3a410334aa6f19caf.tar.bz2 nixlib-82af8640e36c4b37ff3034f3a410334aa6f19caf.tar.lz nixlib-82af8640e36c4b37ff3034f3a410334aa6f19caf.tar.xz nixlib-82af8640e36c4b37ff3034f3a410334aa6f19caf.tar.zst nixlib-82af8640e36c4b37ff3034f3a410334aa6f19caf.zip | |
quazip: move to qmakeHook
This reverts commit d663b3df24b709fd972525ab73855843ff35d09d.
| -rw-r--r-- | pkgs/development/libraries/quazip/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 7ef1a9212a14..a1eb2ad7084c 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zip, zlib, qt }: +{ fetchurl, stdenv, zip, zlib, qt, qmakeHook }: stdenv.mkDerivation rec { name = "quazip-0.7.1"; @@ -8,15 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1pijy6zn8kdx9m6wrckid24vkgp250hklbpmgrpixiam6l889jbq"; }; - configurePhase = '' - runHook preConfigure - cd quazip && qmake quazip.pro - runHook postConfigure - ''; - - installFlags = "INSTALL_ROOT=$(out)"; + preConfigure = "cd quazip"; buildInputs = [ zlib qt ]; + nativeBuildInputs = [ qmakeHook ]; 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 ded7ed829d63..e02186c5212e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3143,7 +3143,7 @@ in screen-message = callPackage ../tools/X11/screen-message { }; screencloud = callPackage ../applications/graphics/screencloud { - quazip = qt5.quazip.override { qt = qt4; }; + quazip = qt5.quazip.override { qt = qt4; qmakeHook = qmake4Hook; }; }; scrot = callPackage ../tools/graphics/scrot { }; |