diff options
| -rw-r--r-- | pkgs/development/libraries/quazip/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index addf9a1dbd6c..cac861fe2248 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,21 +1,19 @@ -{ fetchFromGitHub, stdenv, zlib, qtbase, qmake, fixDarwinDylibNames }: +{ fetchFromGitHub, stdenv, zlib, qtbase, cmake, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "quazip"; - version = "0.7.6"; + version = "0.8.1"; src = fetchFromGitHub { owner = "stachenov"; repo = pname; - rev = version; - sha256 = "1p6khy8fn9bwp14l6wd3sniwwm5v216l8xncfb7a6psjzvq5ypy6"; + rev = "v${version}"; + sha256 = "1g473gnsbkvxpsv8lbsmhspn7jnq86b05zzgqh11r581v8ndvz5s"; }; buildInputs = [ zlib qtbase ]; - nativeBuildInputs = [ qmake ] + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - qmakeFlags = [ "quazip" ] - ++ stdenv.lib.optional stdenv.isDarwin [ "LIBS=-lz" ]; meta = with stdenv.lib; { 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 0bb2810c65e0..e11d685ad191 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5737,7 +5737,7 @@ in screenkey = python2Packages.callPackage ../applications/video/screenkey { }; quazip_qt4 = libsForQt5.quazip.override { - qtbase = qt4; qmake = qmake4Hook; + qtbase = qt4; }; scfbuild = python2.pkgs.callPackage ../tools/misc/scfbuild { }; |