From d3a534863fbde7de368851aaef35b9aeb6b73eb9 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 20 Jun 2019 08:47:52 +0300 Subject: [PATCH 1/2] maintainers: add sikmir --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c5ab50ba5e3..217674ddd4b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4686,6 +4686,11 @@ github = "sigma"; name = "Yann Hodique"; }; + sikmir = { + email = "sikmir@gmail.com"; + github = "sikmir"; + name = "Nikolay Korotkiy"; + }; simonvandel = { email = "simon.vandel@gmail.com"; github = "simonvandel"; From 2c6ba83aa0391e71bcda0eb7d8f0b054ff2d060e Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 19 Jun 2019 10:19:44 +0300 Subject: [PATCH 2/2] qtpbfimageplugin: init at 1.4 --- .../libraries/qtpbfimageplugin/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/libraries/qtpbfimageplugin/default.nix diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix new file mode 100644 index 00000000000..8ad908013bd --- /dev/null +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase, protobuf }: + +stdenv.mkDerivation rec { + pname = "qtpbfimageplugin"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "tumic0"; + repo = "QtPBFImagePlugin"; + rev = version; + sha256 = "0d39i7rmhrmm2df49gd47zm37gnz3fmyr6hfc6hhzvk08jb6956r"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase protobuf ]; + + postPatch = '' + # Fix plugin dir + substituteInPlace pbfplugin.pro \ + --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" + + # Fix darwin build + substituteInPlace pbfplugin.pro \ + --replace '$$PROTOBUF/lib/libprotobuf-lite.a' '${protobuf}/lib/libprotobuf-lite.dylib' + ''; + + meta = with stdenv.lib; { + description = "Qt image plugin for displaying Mapbox vector tiles"; + longDescription = '' + QtPBFImagePlugin is a Qt image plugin that enables applications capable of + displaying raster MBTiles maps or raster XYZ online maps to also display PBF + vector tiles without (almost) any application modifications. + ''; + homepage = https://github.com/tumic0/QtPBFImagePlugin; + license = licenses.lgpl3; + maintainers = [ maintainers.sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b890f34b7f..0dc6af2eb15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12987,6 +12987,8 @@ in qtkeychain = callPackage ../development/libraries/qtkeychain { }; + qtpbfimageplugin = libsForQt5.callPackage ../development/libraries/qtpbfimageplugin { }; + qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; quesoglc = callPackage ../development/libraries/quesoglc { };