diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:31:22 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-13 23:10:56 +0000 |
| commit | 578408aa16443b3301fdb239145f92cb004ece89 (patch) | |
| tree | 2bd7ceebaf192c606d81326b3a82d72ed343039a /pkgs | |
| parent | 9361acfff13586840a41e16496c28dc27848671d (diff) | |
| download | nixlib-578408aa16443b3301fdb239145f92cb004ece89.tar nixlib-578408aa16443b3301fdb239145f92cb004ece89.tar.gz nixlib-578408aa16443b3301fdb239145f92cb004ece89.tar.bz2 nixlib-578408aa16443b3301fdb239145f92cb004ece89.tar.lz nixlib-578408aa16443b3301fdb239145f92cb004ece89.tar.xz nixlib-578408aa16443b3301fdb239145f92cb004ece89.tar.zst nixlib-578408aa16443b3301fdb239145f92cb004ece89.zip | |
brltty: move defaults to package file, use ALSA on Linux
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/brltty/default.nix | 4 | ||||
| -rw-r--r-- | 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 6635f2931955..99ba8e5e5159 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 b684dcd3c2b2..e01aeb721f81 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 { }; |