From 0bedafd57c2a3a6eed875f2120e7d463b782aff6 Mon Sep 17 00:00:00 2001 From: ryan4729 <40183301+ryan4729@users.noreply.github.com> Date: Sun, 19 May 2019 00:41:15 -0700 Subject: [PATCH] libsForQt5.quazip: fix darwin build (#61355) * libsForQt5.quazip: fix darwin build * libsForQt5.quazip: update license --- pkgs/development/libraries/quazip/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index b53335f45c34..addf9a1dbd6c 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, zlib, qtbase, qmake }: +{ fetchFromGitHub, stdenv, zlib, qtbase, qmake, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "quazip"; @@ -12,12 +12,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ zlib qtbase ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + qmakeFlags = [ "quazip" ] + ++ stdenv.lib.optional stdenv.isDarwin [ "LIBS=-lz" ]; - meta = { + meta = with stdenv.lib; { description = "Provides access to ZIP archives from Qt programs"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.lgpl21Plus; homepage = https://stachenov.github.io/quazip/; # Migrated from http://quazip.sourceforge.net/ - platforms = stdenv.lib.platforms.linux; + platforms = with platforms; linux ++ darwin; }; }