diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/mapbox-gl-qml | |
parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mapbox-gl-qml')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix b/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix index 49a7f26220dd..a9a2ad64d7ad 100644 --- a/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix +++ b/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix @@ -6,31 +6,28 @@ , curl , qtbase , qtlocation -, mapbox-gl-native +, maplibre-gl-native }: mkDerivation rec { pname = "mapbox-gl-qml"; - version = "1.7.7.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "rinigus"; repo = "mapbox-gl-qml"; rev = version; - hash = "sha256-lmL9nawMY8rNNBV4zNF4N1gn9XZzIZ9Cw2ZRs9bjBaI="; + hash = "sha256-EVZbQXV8pI0QTqFDTTynVglsqX1O5oK0Pl5Y/wp+/q0="; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ curl qtlocation mapbox-gl-native ]; + buildInputs = [ curl qtlocation maplibre-gl-native ]; postPatch = '' substituteInPlace src/CMakeLists.txt \ --replace ' ''${QT_INSTALL_QML}' " $out/${qtbase.qtQmlPrefix}" ''; - # Package expects qt5 subdirectory of mapbox-gl-native to be in the include path - NIX_CFLAGS_COMPILE = "-I${mapbox-gl-native}/include/qt5"; - meta = with lib; { description = "Unofficial Mapbox GL Native bindings for Qt QML"; homepage = "https://github.com/rinigus/mapbox-gl-qml"; |