public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mapbox-gl-qml: 1.7.5 -> 1.7.6 and move to libsForQt5

This commit is contained in:
Robert Schütz 2021-03-21 11:14:52 +01:00
parent 42f157fd07
commit cccebb6f37
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/development/libraries/mapbox-gl-qml/default.nix
View File

@ -1,22 +1,31 @@
{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtlocation, mapbox-gl-native }: { lib
, mkDerivation
, fetchFromGitHub
, cmake
, pkg-config
, curl
, qtbase
, qtlocation
, mapbox-gl-native
}:
mkDerivation rec { mkDerivation rec {
pname = "mapbox-gl-qml"; pname = "mapbox-gl-qml";
version = "1.7.5"; version = "1.7.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rinigus"; owner = "rinigus";
repo = "mapbox-gl-qml"; repo = "mapbox-gl-qml";
rev = version; rev = version;
sha256 = "1izwkfqn8jl83vihcxl2b159sqmkn1amxf92zw0h6psls2g9xhwx"; sha256 = "sha256-E6Pkr8khzDbhmJxzK943+H6cDREgwAqMnJQ3hQWU7fw=";
}; };
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ qtlocation mapbox-gl-native ]; buildInputs = [ curl qtlocation mapbox-gl-native ];
postPatch = '' postPatch = ''
substituteInPlace mapbox-gl-qml.pro \ substituteInPlace src/CMakeLists.txt \
--replace '$$[QT_INSTALL_QML]' $out'/${qtbase.qtQmlPrefix}' --replace ' ''${QT_INSTALL_QML}' " $out/${qtbase.qtQmlPrefix}"
''; '';
# Package expects qt5 subdirectory of mapbox-gl-native to be in the include path # Package expects qt5 subdirectory of mapbox-gl-native to be in the include path
@ -26,7 +35,7 @@ mkDerivation rec {
description = "Unofficial Mapbox GL Native bindings for Qt QML"; description = "Unofficial Mapbox GL Native bindings for Qt QML";
homepage = "https://github.com/rinigus/mapbox-gl-qml"; homepage = "https://github.com/rinigus/mapbox-gl-qml";
license = licenses.lgpl3Only; license = licenses.lgpl3Only;
maintainers = [ maintainers.Thra11 ]; maintainers = with maintainers; [ Thra11 dotlambda ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -16077,8 +16077,6 @@ in
opencl-clang = callPackage ../development/libraries/opencl-clang { }; opencl-clang = callPackage ../development/libraries/opencl-clang { };
mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { };
mapnik = callPackage ../development/libraries/mapnik { }; mapnik = callPackage ../development/libraries/mapnik { };
marisa = callPackage ../development/libraries/marisa {}; marisa = callPackage ../development/libraries/marisa {};

2
pkgs/top-level/qt5-packages.nix
View File

@ -117,6 +117,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 //
mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { }; mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { };
mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { };
mauikit = callPackage ../development/libraries/mauikit { }; mauikit = callPackage ../development/libraries/mauikit { };
mlt = callPackage ../development/libraries/mlt/qt-5.nix { }; mlt = callPackage ../development/libraries/mlt/qt-5.nix { };