summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorrnhmjoj <rnhmjoj@inventati.org>2019-06-21 11:17:33 +0200
committerrnhmjoj <rnhmjoj@inventati.org>2019-11-29 21:08:58 +0100
commit1598f3d257f1101fcb32f08923dd8706616086b4 (patch)
tree37344ec7ebddb80a7fd5e4c288ba061746db6e6d /nixos
parent6317f5b81cedb5396f95b522afa84bc5059c3c1e (diff)
downloadnixpkgs-1598f3d257f1101fcb32f08923dd8706616086b4.tar
nixpkgs-1598f3d257f1101fcb32f08923dd8706616086b4.tar.gz
nixpkgs-1598f3d257f1101fcb32f08923dd8706616086b4.tar.bz2
nixpkgs-1598f3d257f1101fcb32f08923dd8706616086b4.tar.lz
nixpkgs-1598f3d257f1101fcb32f08923dd8706616086b4.tar.xz
nixpkgs-1598f3d257f1101fcb32f08923dd8706616086b4.tar.zst
nixpkgs-1598f3d257f1101fcb32f08923dd8706616086b4.zip
nixos/bluetooth: don't install obex tools by default
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/release-notes/rl-2003.xml7
-rw-r--r--nixos/modules/services/hardware/bluetooth.nix2
2 files changed, 8 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 2a5064c71b0..b13aa1ba3dc 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -199,6 +199,13 @@
       This has led to drastically reduced closed sizes for some rust crates since development dependencies are now in the <literal>lib</literal> output.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The packages <literal>openobex</literal> and <literal>obexftp</literal>
+     are no loger installed when enabling bluetooth via
+     <option>hardware.bluetooth.enable</option>.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
index 7b13beea1ca..11d67418a31 100644
--- a/nixos/modules/services/hardware/bluetooth.nix
+++ b/nixos/modules/services/hardware/bluetooth.nix
@@ -72,7 +72,7 @@ in {
       };
     };
 
-    environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ];
+    environment.systemPackages = [ bluez-bluetooth ];
 
     environment.etc = singleton {
       source = pkgs.writeText "main.conf" (generators.toINI { } cfg.config + optionalString (cfg.extraConfig != null) cfg.extraConfig);