Merge staging-next into master

This commit is contained in:
Frederik Rietdijk
2018-12-08 16:29:21 +01:00
486 changed files with 2671 additions and 2390 deletions
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, lib
, intltool, glib, pkgconfig, polkit, python, sqlite
, gobjectIntrospection, vala_0_38, gtk-doc, autoreconfHook, autoconf-archive
, gobject-introspection, vala_0_38, gtk-doc, autoreconfHook, autoconf-archive
# TODO: set enableNixBackend to true, as soon as it builds
, nix, enableNixBackend ? false, boost
, enableCommandNotFound ? false
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
sha256 = "02wq3jw3mkdld90irh5vdfd5bri2g1p89mhrmj56kvif1fqak46x";
};
buildInputs = [ glib polkit python gobjectIntrospection vala_0_38 ]
buildInputs = [ glib polkit python gobject-introspection vala_0_38 ]
++ lib.optional enableSystemd systemd
++ lib.optional enableBashCompletion bash-completion;
propagatedBuildInputs = [ sqlite nix boost ];