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 | 8bea69348ae0f286b395e9087db7d70e6f1a375a (patch) | |
| tree | 956a2dfb39f0ca1bb00ba40bd21e18037f1093fb /tv/2configs | |
| parent | 179e95d0bfc985940d4970d6c1365c2c8e000d0d (diff) | |
| parent | 72cd01d104bb61b5a5e28c2c10e0bd2bd55ce681 (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 0caf5264a..fc8fc81f2 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 2e679bd14..ea3970152 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 && |