diff options
| author | jeschli <jeschli@gmail.com> | 2019-04-23 20:15:10 +0200 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2019-04-23 20:15:10 +0200 |
| commit | 8c985b782ace6f4bfebe29d9f365119f422d59ab (patch) | |
| tree | f5764e61de6ff5ccd0bda3c9e1b0ed71eadd7aa9 /tv/2configs | |
| parent | d3c5a5b3d404a0639f2ce5388af3084c2ece1d78 (diff) | |
| parent | 7104abdb98661ba4831871112b6e03f6ee0d3c96 (diff) | |
Merge branch 'master' of prism.r:stockholm
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 && |