Merge pull request #108075 from sikmir/qtpbfimageplugin

qtpbfimageplugin: 2.2 → 2.3
This commit is contained in:
Sandro 2020-12-31 21:53:08 +01:00 committed by GitHub
commit 864a2f9aaa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "qtpbfimageplugin"; pname = "qtpbfimageplugin";
version = "2.2"; version = "2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tumic0"; owner = "tumic0";
repo = "QtPBFImagePlugin"; repo = "QtPBFImagePlugin";
rev = version; rev = version;
sha256 = "1w2d33g13vkjasabmcgvhsmfqv3jmwbxhqxm1jnyc7d4nlk4jwmb"; sha256 = "063agzcrcihasqqk2yqxqxg9xknjs99y6vx3n1v7md7dqnfv4iva";
}; };
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
# Fix plugin dir # Fix plugin dir
substituteInPlace pbfplugin.pro \ substituteInPlace pbfplugin.pro \
--replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
# Fix darwin build # Fix darwin build
substituteInPlace pbfplugin.pro \ substituteInPlace pbfplugin.pro \
--replace '$$PROTOBUF/lib/libprotobuf-lite.a' '${protobuf}/lib/libprotobuf-lite.dylib' --replace '$$PROTOBUF/lib/libprotobuf-lite.a' '${protobuf}/lib/libprotobuf-lite.dylib'
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
vector tiles without (almost) any application modifications. vector tiles without (almost) any application modifications.
''; '';
homepage = "https://github.com/tumic0/QtPBFImagePlugin"; homepage = "https://github.com/tumic0/QtPBFImagePlugin";
license = licenses.lgpl3; license = licenses.lgpl3Only;
maintainers = with maintainers; [ sikmir ]; maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix; platforms = platforms.unix;
}; };