From f66613b3b60877a41bd6062d35cab37c2f940402 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 23 Aug 2019 17:59:50 +0200
Subject: [PATCH] nixos/ofono: add module

---
 nixos/modules/module-list.nix               |  1 +
 nixos/modules/services/networking/ofono.nix | 20 ++++++++++++++++++++
 pkgs/tools/networking/ofono/default.nix     |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/networking/ofono.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 5335ba3abd1..f0b3e88ad7f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -648,6 +648,7 @@
   ./services/networking/nullidentdmod.nix
   ./services/networking/nylon.nix
   ./services/networking/ocserv.nix
+  ./services/networking/ofono.nix
   ./services/networking/oidentd.nix
   ./services/networking/openfire.nix
   ./services/networking/openntpd.nix
diff --git a/nixos/modules/services/networking/ofono.nix b/nixos/modules/services/networking/ofono.nix
new file mode 100644
index 00000000000..58b7d7e7ed6
--- /dev/null
+++ b/nixos/modules/services/networking/ofono.nix
@@ -0,0 +1,20 @@
+# Ofono daemon.
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  ###### interface
+  options = {
+    services.ofono = {
+      enable = mkEnableOption "Ofono";
+    };
+  };
+
+  ###### implementation
+  config = mkIf config.services.ofono.enable {
+    services.dbus.packages = [ pkgs.ofono ];
+
+    systemd.packages = [ pkgs.ofono ];
+  };
+}
diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix
index 1e5bd6b66f5..168c9139ddd 100644
--- a/pkgs/tools/networking/ofono/default.nix
+++ b/pkgs/tools/networking/ofono/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--with-dbusconfdir=${placeholder ''out''}/etc/dbus-1/system.d"
+    "--with-dbusconfdir=${placeholder ''out''}/share"
     "--with-systemdunitdir=${placeholder ''out''}/lib/systemd/system"
     "--enable-external-ell"
   ];