From 75162b1045b0bfdb9399de2db712b376d586ef4e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 21 Jul 2018 02:29:02 +0200 Subject: [PATCH 1/3] geoclue: drop --- .../development/libraries/geoclue/default.nix | 36 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 38 deletions(-) delete mode 100644 pkgs/development/libraries/geoclue/default.nix diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix deleted file mode 100644 index bf0af502d01..00000000000 --- a/pkgs/development/libraries/geoclue/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, dbus, dbus-glib, glib, pkgconfig, libxml2, gnome2, - libxslt, glib-networking }: - -stdenv.mkDerivation rec { - name = "geoclue-0.12.0"; - src = fetchurl { - url = "https://launchpad.net/geoclue/trunk/0.12/+download/${name}.tar.gz"; - sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 gnome2.GConf libxslt glib-networking ]; - - propagatedBuildInputs = [dbus glib dbus-glib]; - - hardeningDisable = [ "format" ]; - - preConfigure = '' - sed -e '/-Werror/d' -i configure - ''; - - meta = with stdenv.lib; { - description = "Geolocation framework and some data providers"; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - license = licenses.lgpl2; - }; - - passthru = { - updateInfo = { - downloadPage = "http://folks.o-hand.com/jku/geoclue-releases/"; - }; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 644f5d821e6..a7451517a9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9232,8 +9232,6 @@ with pkgs; gtk = self.gtk2; }; - geoclue = callPackage ../development/libraries/geoclue {}; - geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {}; geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) { From 919a507cb2bcff3f449dbef57082e24c1a32827e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 21 Jul 2018 02:30:10 +0200 Subject: [PATCH 2/3] geoclue2: move to default.nix --- pkgs/development/libraries/geoclue/{2.0.nix => default.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/libraries/geoclue/{2.0.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/default.nix similarity index 100% rename from pkgs/development/libraries/geoclue/2.0.nix rename to pkgs/development/libraries/geoclue/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7451517a9f..1a55c07e88e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9232,7 +9232,7 @@ with pkgs; gtk = self.gtk2; }; - geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {}; + geoclue2 = callPackage ../development/libraries/geoclue {}; geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) { drvName = "geoip-tools"; From a6dab86ada516b09096a77ff24b3b3291e80ef50 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 21 Jul 2018 02:44:15 +0200 Subject: [PATCH 3/3] =?UTF-8?q?geoclue2:=202.4.8=20=E2=86=92=202.4.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/libraries/geoclue/default.nix | 52 +++++++++++-------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index eb7a6d6aaf2..2588d7f3d54 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -1,48 +1,54 @@ -{ fetchurl, stdenv, intltool, pkgconfig, glib, json-glib, libsoup, geoip -, dbus, dbus-glib, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection +{ fetchurl, stdenv, intltool, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf +, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection +, withDemoAgent ? false }: with stdenv.lib; stdenv.mkDerivation rec { - name = "geoclue-2.4.8"; + name = "geoclue-${version}"; + version = "2.4.10"; src = fetchurl { - url = "https://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz"; - sha256 = "08yg1r7m0n9hwyvcy769qkmkf8lslqwv69cjfffwnc3zm5km25qj"; + url = "https://www.freedesktop.org/software/geoclue/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "0h4n8jf7w457sglfdhghkyf8n4v4a5jrx8dgdy5zn35nbscx24l4"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ - pkgconfig intltool wrapGAppsHook gobjectIntrospection + pkgconfig intltool gtk-doc docbook_xsl docbook_xml_dtd_412 wrapGAppsHook gobjectIntrospection ]; - buildInputs = [ glib json-glib libsoup geoip - dbus dbus-glib avahi - ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; + buildInputs = [ + glib json-glib libsoup avahi + ] ++ optionals withDemoAgent [ + libnotify gdk_pixbuf + ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; - propagatedBuildInputs = [ dbus dbus-glib glib glib-networking ]; + propagatedBuildInputs = [ glib glib-networking ]; - preConfigure = '' - substituteInPlace configure --replace "-Werror" "" - ''; - - configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--enable-introspection" ] ++ - optionals stdenv.isDarwin [ - "--disable-silent-rules" - "--disable-3g-source" - "--disable-cdma-source" - "--disable-modem-gps-source" - "--disable-nmea-source" ]; + configureFlags = [ + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--enable-introspection" + "--enable-gtk-doc" + "--enable-demo-agent=${if withDemoAgent then "yes" else "no"}" + ] ++ optionals stdenv.isDarwin [ + "--disable-silent-rules" + "--disable-3g-source" + "--disable-cdma-source" + "--disable-modem-gps-source" + "--disable-nmea-source" + ]; + # https://gitlab.freedesktop.org/geoclue/geoclue/issues/73 postInstall = '' sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|" ''; meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; - homepage = https://freedesktop.org/wiki/Software/GeoClue/; + homepage = https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home; maintainers = with maintainers; [ raskin garbas ]; platforms = with platforms; linux ++ darwin; license = licenses.lgpl2;