libsForQt5.quazip: 0.7.6 -> 0.8.1

This commit is contained in:
Nikolay Amiantov 2019-06-01 15:45:03 +03:00
parent 96d7057f9c
commit b959dc1493
2 changed files with 6 additions and 8 deletions

View File

@ -1,21 +1,19 @@
{ fetchFromGitHub, stdenv, zlib, qtbase, qmake, fixDarwinDylibNames }: { fetchFromGitHub, stdenv, zlib, qtbase, cmake, fixDarwinDylibNames }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "quazip"; pname = "quazip";
version = "0.7.6"; version = "0.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stachenov"; owner = "stachenov";
repo = pname; repo = pname;
rev = version; rev = "v${version}";
sha256 = "1p6khy8fn9bwp14l6wd3sniwwm5v216l8xncfb7a6psjzvq5ypy6"; sha256 = "1g473gnsbkvxpsv8lbsmhspn7jnq86b05zzgqh11r581v8ndvz5s";
}; };
buildInputs = [ zlib qtbase ]; buildInputs = [ zlib qtbase ];
nativeBuildInputs = [ qmake ] nativeBuildInputs = [ cmake ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
qmakeFlags = [ "quazip" ]
++ stdenv.lib.optional stdenv.isDarwin [ "LIBS=-lz" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Provides access to ZIP archives from Qt programs"; description = "Provides access to ZIP archives from Qt programs";

View File

@ -5737,7 +5737,7 @@ in
screenkey = python2Packages.callPackage ../applications/video/screenkey { }; screenkey = python2Packages.callPackage ../applications/video/screenkey { };
quazip_qt4 = libsForQt5.quazip.override { quazip_qt4 = libsForQt5.quazip.override {
qtbase = qt4; qmake = qmake4Hook; qtbase = qt4;
}; };
scfbuild = python2.pkgs.callPackage ../tools/misc/scfbuild { }; scfbuild = python2.pkgs.callPackage ../tools/misc/scfbuild { };