summaryrefslogtreecommitdiffstats
path: root/pkgs/development/libraries/geoclue/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries/geoclue/default.nix')
-rw-r--r--pkgs/development/libraries/geoclue/default.nix29
1 files changed, 5 insertions, 24 deletions
diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index d7b417ac09e9..519becfc6326 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -27,38 +27,19 @@
stdenv.mkDerivation rec {
pname = "geoclue";
- version = "2.5.7";
+ version = "2.6.0";
outputs = [ "out" "dev" "devdoc" ];
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
- owner = pname;
- repo = pname;
+ owner = "geoclue";
+ repo = "geoclue";
rev = version;
- sha256 = "1mv1vs4q94bqkmgkj53jcsw1x31kczwydyy3r27a7fycgzmii1pj";
+ hash = "sha256-TbuO9wpyjtvyvqaCryaTOunR0hVVlJuqENWQQpcMcz4=";
};
patches = [
- # Fix for falling back to GeoIP when WiFi devices are not found
- # https://gitlab.freedesktop.org/geoclue/geoclue/-/commit/2de651b6590087a2df2defe8f3d85b3cf6b91494
- # NOTE: this should be removed when the next version is released
- (fetchpatch {
- url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/2de651b6590087a2df2defe8f3d85b3cf6b91494.patch";
- sha256 = "hv7t2Hmpv2oDXiPWA7JpYD9q+cuuk+En/lJJickvFII=";
- })
-
- # Make the Mozilla API key configurable
- # https://gitlab.freedesktop.org/geoclue/geoclue/merge_requests/54 (only partially backported)
- (fetchpatch {
- url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/95c9ad4dc176860c85a07d0db4cb4179929bdb54.patch";
- sha256 = "/lq/dLBJl2vf16tt7emYoTtXY6iUw+4s2XcABUHp3Kc=";
- })
- (fetchpatch {
- url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/1a00809a0d89b0849a57647c878d192354247a33.patch";
- sha256 = "6FuiukgFWg2cEKt8LlKP4E0rfSH/ZQgk6Ip1mGJpNFQ=";
- })
-
./add-option-for-installation-sysconfdir.patch
];
@@ -122,6 +103,6 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home";
maintainers = with maintainers; [ raskin ];
platforms = with platforms; linux ++ darwin;
- license = licenses.lgpl2;
+ license = licenses.lgpl2Plus;
};
}