tangled
alpha
login
or
join now
tjh.dev
/
nixpkgs
0
fork
atom
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
0
fork
atom
overview
issues
pulls
pipelines
mapbox-gl-qml: 1.7.5 -> 1.7.6 and move to libsForQt5
Robert Schütz
5 years ago
cccebb6f
42f157fd
+19
-10
3 changed files
expand all
collapse all
unified
split
pkgs
development
libraries
mapbox-gl-qml
default.nix
top-level
all-packages.nix
qt5-packages.nix
+17
-8
pkgs/development/libraries/mapbox-gl-qml/default.nix
···
1
1
-
{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtlocation, mapbox-gl-native }:
1
1
+
{ lib
2
2
+
, mkDerivation
3
3
+
, fetchFromGitHub
4
4
+
, cmake
5
5
+
, pkg-config
6
6
+
, curl
7
7
+
, qtbase
8
8
+
, qtlocation
9
9
+
, mapbox-gl-native
10
10
+
}:
2
11
3
12
mkDerivation rec {
4
13
pname = "mapbox-gl-qml";
5
5
-
version = "1.7.5";
14
14
+
version = "1.7.6";
6
15
7
16
src = fetchFromGitHub {
8
17
owner = "rinigus";
9
18
repo = "mapbox-gl-qml";
10
19
rev = version;
11
11
-
sha256 = "1izwkfqn8jl83vihcxl2b159sqmkn1amxf92zw0h6psls2g9xhwx";
20
20
+
sha256 = "sha256-E6Pkr8khzDbhmJxzK943+H6cDREgwAqMnJQ3hQWU7fw=";
12
21
};
13
22
14
14
-
nativeBuildInputs = [ qmake ];
15
15
-
buildInputs = [ qtlocation mapbox-gl-native ];
23
23
+
nativeBuildInputs = [ cmake pkg-config ];
24
24
+
buildInputs = [ curl qtlocation mapbox-gl-native ];
16
25
17
26
postPatch = ''
18
18
-
substituteInPlace mapbox-gl-qml.pro \
19
19
-
--replace '$$[QT_INSTALL_QML]' $out'/${qtbase.qtQmlPrefix}'
27
27
+
substituteInPlace src/CMakeLists.txt \
28
28
+
--replace ' ''${QT_INSTALL_QML}' " $out/${qtbase.qtQmlPrefix}"
20
29
'';
21
30
22
31
# Package expects qt5 subdirectory of mapbox-gl-native to be in the include path
···
26
35
description = "Unofficial Mapbox GL Native bindings for Qt QML";
27
36
homepage = "https://github.com/rinigus/mapbox-gl-qml";
28
37
license = licenses.lgpl3Only;
29
29
-
maintainers = [ maintainers.Thra11 ];
38
38
+
maintainers = with maintainers; [ Thra11 dotlambda ];
30
39
platforms = platforms.linux;
31
40
};
32
41
}
-2
pkgs/top-level/all-packages.nix
···
16077
16077
16078
16078
opencl-clang = callPackage ../development/libraries/opencl-clang { };
16079
16079
16080
16080
-
mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { };
16081
16081
-
16082
16080
mapnik = callPackage ../development/libraries/mapnik { };
16083
16081
16084
16082
marisa = callPackage ../development/libraries/marisa {};
+2
pkgs/top-level/qt5-packages.nix
···
117
117
118
118
mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { };
119
119
120
120
+
mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { };
121
121
+
120
122
mauikit = callPackage ../development/libraries/mauikit { };
121
123
122
124
mlt = callPackage ../development/libraries/mlt/qt-5.nix { };