tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
geoclue2: 2.5.7 → 2.6.0
Nikolay Korotkiy
3 years ago
decaeb0f
25f7edcc
+9
-28
2 changed files
expand all
collapse all
unified
split
pkgs
development
libraries
geoclue
add-option-for-installation-sysconfdir.patch
default.nix
+4
-4
pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch
···
1
1
diff --git a/data/meson.build b/data/meson.build
2
2
-
index c189753..12c10cb 100644
2
2
+
index a1fc61f..7c03882 100644
3
3
--- a/data/meson.build
4
4
+++ b/data/meson.build
5
5
@@ -7,7 +7,7 @@ if get_option('enable-backend')
···
43
43
desktop_file.full_path(),
44
44
autostart_dir)
45
45
diff --git a/meson.build b/meson.build
46
46
-
index fde6fa3..39b7b0a 100644
46
46
+
index 8aa5c31..b011879 100644
47
47
--- a/meson.build
48
48
+++ b/meson.build
49
49
@@ -12,7 +12,11 @@ gclue_api_version='2.0'
···
69
69
conf.set10('GCLUE_USE_3G_SOURCE', get_option('3g-source'))
70
70
conf.set10('GCLUE_USE_CDMA_SOURCE', get_option('cdma-source'))
71
71
diff --git a/meson_options.txt b/meson_options.txt
72
72
-
index 83bc60e..b726329 100644
72
72
+
index 5b8c42d..945dfd5 100644
73
73
--- a/meson_options.txt
74
74
+++ b/meson_options.txt
75
75
-
@@ -34,6 +34,9 @@ option('systemd-system-unit-dir',
75
75
+
@@ -40,6 +40,9 @@ option('systemd-system-unit-dir',
76
76
option('dbus-srv-user',
77
77
type: 'string', value: 'root',
78
78
description: 'The user (existing) as which the service will run')
+5
-24
pkgs/development/libraries/geoclue/default.nix
···
27
27
28
28
stdenv.mkDerivation rec {
29
29
pname = "geoclue";
30
30
-
version = "2.5.7";
30
30
+
version = "2.6.0";
31
31
32
32
outputs = [ "out" "dev" "devdoc" ];
33
33
34
34
src = fetchFromGitLab {
35
35
domain = "gitlab.freedesktop.org";
36
36
-
owner = pname;
37
37
-
repo = pname;
36
36
+
owner = "geoclue";
37
37
+
repo = "geoclue";
38
38
rev = version;
39
39
-
sha256 = "1mv1vs4q94bqkmgkj53jcsw1x31kczwydyy3r27a7fycgzmii1pj";
39
39
+
hash = "sha256-TbuO9wpyjtvyvqaCryaTOunR0hVVlJuqENWQQpcMcz4=";
40
40
};
41
41
42
42
patches = [
43
43
-
# Fix for falling back to GeoIP when WiFi devices are not found
44
44
-
# https://gitlab.freedesktop.org/geoclue/geoclue/-/commit/2de651b6590087a2df2defe8f3d85b3cf6b91494
45
45
-
# NOTE: this should be removed when the next version is released
46
46
-
(fetchpatch {
47
47
-
url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/2de651b6590087a2df2defe8f3d85b3cf6b91494.patch";
48
48
-
sha256 = "hv7t2Hmpv2oDXiPWA7JpYD9q+cuuk+En/lJJickvFII=";
49
49
-
})
50
50
-
51
51
-
# Make the Mozilla API key configurable
52
52
-
# https://gitlab.freedesktop.org/geoclue/geoclue/merge_requests/54 (only partially backported)
53
53
-
(fetchpatch {
54
54
-
url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/95c9ad4dc176860c85a07d0db4cb4179929bdb54.patch";
55
55
-
sha256 = "/lq/dLBJl2vf16tt7emYoTtXY6iUw+4s2XcABUHp3Kc=";
56
56
-
})
57
57
-
(fetchpatch {
58
58
-
url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/1a00809a0d89b0849a57647c878d192354247a33.patch";
59
59
-
sha256 = "6FuiukgFWg2cEKt8LlKP4E0rfSH/ZQgk6Ip1mGJpNFQ=";
60
60
-
})
61
61
-
62
43
./add-option-for-installation-sysconfdir.patch
63
44
];
64
45
···
122
103
homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home";
123
104
maintainers = with maintainers; [ raskin ];
124
105
platforms = with platforms; linux ++ darwin;
125
125
-
license = licenses.lgpl2;
106
106
+
license = licenses.lgpl2Plus;
126
107
};
127
108
}