Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

geoclue2: 2.4.3 -> 2.4.7 and add wrapGAppsHook #30314

Merged
merged 2 commits into from Oct 11, 2017
Merged

Conversation

ArdaXi
Copy link
Contributor

@ArdaXi ArdaXi commented Oct 11, 2017

Motivation for this change

geoclue2 on my machine failed to contact Mozilla because it was unable to find glib_networking. On GNOME systems this will be set by environment variable, but without GNOME it isn't. Adding glib_networking via the wrapGAppsHook solved this issue.

Additionally, when geoclue2 found an NMEA source on the local network via Avahi, it would crash on No GSettings schemas are installed on the system without that hook.

This PR solves both problems, as well as upgrading the package to the latest upstream.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Copy link
Contributor

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Builds fine, looks safe according to changelog.

$ maintainers/scripts/rebuild-amount.sh master
Estimating rebuild amount by counting changed Hydra jobs.
     14 x86_64-darwin
    104 x86_64-linux

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

buildInputs = libintlOrEmpty ++
[ intltool glib json_glib libsoup geoip
dbus dbus_glib avahi
dbus dbus_glib avahi wrapGAppsHook
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wrapGAppsHook should be moved to nativeBuildInputs. And while you are at it, can you also move intltool there?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, thanks!

geoclue2 without GNOME requires glib_networking in order to make HTTPS
connections to location providers. Additionally, geoclue2 crashes if an
NMEA provider is found on the network without GSettings support.

Also moved intltool to nativeBuildInputs as per good practices.
@Mic92 Mic92 added the 9.needs: port to stable A PR needs a backport to the stable release. label Oct 11, 2017
@Mic92 Mic92 merged commit 48f0389 into NixOS:master Oct 11, 2017
@Mic92
Copy link
Member

Mic92 commented Oct 11, 2017

also backported to 17.09.

@ArdaXi ArdaXi deleted the geoclue-fixes branch October 11, 2017 17:05
@samueldr samueldr removed the 9.needs: port to stable A PR needs a backport to the stable release. label Apr 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants