From 578408aa16443b3301fdb239145f92cb004ece89 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:22 +0000 Subject: [PATCH] brltty: move defaults to package file, use ALSA on Linux --- pkgs/tools/misc/brltty/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 6 ++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index 6635f293195..99ba8e5e515 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, python3, alsaSupport, alsaLib ? null, bluez, systemdSupport, systemd ? null }: +{ stdenv, fetchurl, pkgconfig, python3, bluez +, alsaSupport ? stdenv.isLinux, alsaLib ? null +, systemdSupport ? stdenv.isLinux, systemd ? null }: assert alsaSupport -> alsaLib != null; assert systemdSupport -> systemd != null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b684dcd3c2b..e01aeb721f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -967,10 +967,8 @@ in brigand = callPackage ../development/libraries/brigand { }; - brltty = callPackage ../tools/misc/brltty { - alsaSupport = (!stdenv.isDarwin); - systemdSupport = stdenv.isLinux; - }; + brltty = callPackage ../tools/misc/brltty { }; + bro = callPackage ../applications/networking/ids/bro { }; bruteforce-luks = callPackage ../tools/security/bruteforce-luks { };