dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #45872 from worldofpeace/geoclue/patch

Browse Source 
geoclue2: add patch to whitelist elementary's agent
This commit is contained in:
Jan Tojnar 2018-09-01 11:23:01 +01:00 committed by GitHub
commit bc60ee1122
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/geoclue/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, intltool, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf { 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 , modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection
, withDemoAgent ? false , withDemoAgent ? false
}: }:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig intltool wrapGAppsHook gobjectIntrospection pkgconfig intltool wrapGAppsHook gobjectIntrospection
# devdoc # devdoc
gtk-doc docbook_xsl docbook_xml_dtd_412 gtk-doc docbook_xsl docbook_xml_dtd_412
]; ];
buildInputs = [ buildInputs = [
@ -30,6 +30,14 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib glib-networking ]; propagatedBuildInputs = [ glib glib-networking ];
# Whitelist elementary's agent
patches = [
(fetchpatch {
url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/2b0491e408be1ebcdbe8751bb2637c1acb78f71e.patch";
sha256 = "0pac94y55iksk340dlx3gkhb9lrci90mxqqy5fnh1zbjw9bqxfn4";
})
];
configureFlags = [ configureFlags = [
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--enable-introspection" "--enable-introspection"