diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-12-01 22:50:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-01 22:50:47 +0000 |
| commit | 15951cba08652a724c06c7ad4215b5aea8ede211 (patch) | |
| tree | e4efb02f0f2559d23e984a41a27c25fa553ea193 /nixos | |
| parent | d04e10b3d70e6475f4d27eb58f23766fc5201130 (diff) | |
| parent | 40d4c3c93e2a02efa79c00e9efbdf94d9e11cc38 (diff) | |
| download | nixpkgs-15951cba08652a724c06c7ad4215b5aea8ede211.tar nixpkgs-15951cba08652a724c06c7ad4215b5aea8ede211.tar.gz nixpkgs-15951cba08652a724c06c7ad4215b5aea8ede211.tar.bz2 nixpkgs-15951cba08652a724c06c7ad4215b5aea8ede211.tar.lz nixpkgs-15951cba08652a724c06c7ad4215b5aea8ede211.tar.xz nixpkgs-15951cba08652a724c06c7ad4215b5aea8ede211.tar.zst nixpkgs-15951cba08652a724c06c7ad4215b5aea8ede211.zip | |
Merge pull request #63607 from rnhmjoj/remove-obex
nixos/bluetooth: don't install obex tools by default
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2003.xml | 7 | ||||
| -rw-r--r-- | nixos/modules/services/hardware/bluetooth.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 2 |
3 files changed, 9 insertions, 2 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); diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index da8bdcb78c4..56015874723 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -169,7 +169,7 @@ in ++ lib.optional (cfg.phononBackend == "vlc") libsForQt5.phonon-backend-vlc # Optional hardware support features - ++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt ] + ++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt openobex obexftp ] ++ lib.optional config.networking.networkmanager.enable plasma-nm ++ lib.optional config.hardware.pulseaudio.enable plasma-pa ++ lib.optional config.powerManagement.enable powerdevil |