From 3ee297b992e95426b9e2bdf032b05fc975cd7bed Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 31 Aug 2018 21:47:02 -0400 Subject: [PATCH] Revert "geoclue2: add patch to whitelist elementary's agent" This reverts commit ac61b96d1c1662cd281fa6af2b249d311fe67e87. --- pkgs/development/libraries/geoclue/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index da7041b6786f..8417719b7063 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, fetchpatch, intltool, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf +{ 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 }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook gobjectIntrospection # devdoc - gtk-doc docbook_xsl docbook_xml_dtd_412 + gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ @@ -30,14 +30,6 @@ 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"