diff options
| author | makefu <github@syntax-fehler.de> | 2019-04-12 19:28:17 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2019-04-12 19:28:17 +0200 |
| commit | 20e52ee5da77f849f677ab3875e05a962d4cab7a (patch) | |
| tree | 193266a7b81702fcd3f62ccc2a074ba398ae14ac /tv/2configs | |
| parent | d1c63e884f840853d238121a8526604b784f9ac3 (diff) | |
| parent | 8381844a919e17fed6a2393d34cabdf2f441d6ea (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv/2configs')
| -rw-r--r-- | tv/2configs/mail-client.nix | 1 | ||||
| -rw-r--r-- | tv/2configs/pulse.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tv/2configs/mail-client.nix b/tv/2configs/mail-client.nix index 0caf526..fc8fc81 100644 --- a/tv/2configs/mail-client.nix +++ b/tv/2configs/mail-client.nix @@ -3,7 +3,6 @@ pkgs.haskellPackages.much pkgs.msmtp pkgs.notmuch - pkgs.pythonPackages.alot pkgs.qprint pkgs.w3m ]; diff --git a/tv/2configs/pulse.nix b/tv/2configs/pulse.nix index 2e679bd..ea39701 100644 --- a/tv/2configs/pulse.nix +++ b/tv/2configs/pulse.nix @@ -1,10 +1,12 @@ -{ config, lib, pkgs, pkgs_i686, ... }: +{ config, lib, pkgs, ... }: with import <stockholm/lib>; let pkg = pkgs.pulseaudioLight; runDir = "/run/pulse"; + pkgs_i686 = pkgs.pkgsi686Linux; + support32Bit = pkgs.stdenv.isx86_64 && pkgs_i686.alsaLib != null && |