diff options
author | worldofpeace <worldofpeace@users.noreply.github.com> | 2018-11-30 17:14:39 -0500 |
---|---|---|
committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2018-11-30 17:14:39 -0500 |
commit | 607aefd9721fdbf71f96699b5f4e81a2e9a8b07e (patch) | |
tree | bf2fd74c9d17360a40f615cc29c3963aa399f709 /pkgs/development/libraries/geoclue/default.nix | |
parent | 095544187a8ed13f14356f5df7dbe0ecc059ceb5 (diff) |
geoclue2: 2.4.12 -> 2.5.1
Diffstat (limited to 'pkgs/development/libraries/geoclue/default.nix')
-rw-r--r-- | pkgs/development/libraries/geoclue/default.nix | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index da7041b6786f5..a716b78cdc7fd 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, stdenv, fetchpatch, intltool, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf -, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection +{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf +, modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobjectIntrospection, vala , withDemoAgent ? false }: @@ -7,17 +7,20 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "geoclue-${version}"; - version = "2.4.12"; - - src = fetchurl { - url = "https://www.freedesktop.org/software/geoclue/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1jnad1f3rf8h05sz1lc172jnqdhqdpz76ff6m7i5ss3s0znf5l05"; + version = "2.5.1"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "geoclue"; + repo = "geoclue"; + rev = version; + sha256 = "0vww6irijw5ss7vawkdi5z5wdpcgw4iqljn5vs3vbd4y3d0lzrbs"; }; outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ - pkgconfig intltool wrapGAppsHook gobjectIntrospection + pkgconfig meson ninja wrapGAppsHook python3 vala gobjectIntrospection # devdoc gtk-doc docbook_xsl docbook_xml_dtd_412 ]; @@ -30,27 +33,21 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib glib-networking ]; - # Whitelist elementary's agent - patches = [ - (fetchpatch { - url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/2b0491e408be1ebcdbe8751bb2637c1acb78f71e.patch"; - sha256 = "0pac94y55iksk340dlx3gkhb9lrci90mxqqy5fnh1zbjw9bqxfn4"; - }) - ]; - - configureFlags = [ - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--enable-introspection" - "--enable-gtk-doc" - "--enable-demo-agent=${if withDemoAgent then "yes" else "no"}" + mesonFlags = [ + "-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system" + "-Ddemo-agent=${if withDemoAgent then "true" else "false"}" ] ++ optionals stdenv.isDarwin [ - "--disable-silent-rules" - "--disable-3g-source" - "--disable-cdma-source" - "--disable-modem-gps-source" - "--disable-nmea-source" + "-D3g-source=false" + "-Dcdma-source=false" + "-Dmodem-gps-source=false" + "-Dnmea-source=false" ]; + postPatch = '' + chmod +x demo/install-file.py + patchShebangs demo/install-file.py + ''; + meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; homepage = https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home; |