diff options
| author | Domen Kožar <domen@dev.si> | 2014-10-07 21:02:18 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-10-07 21:46:15 +0200 |
| commit | 4941b96f0ce45bcc9c922e9a219aa2792753a09a (patch) | |
| tree | d141054024f24074225e16167a68f9dd9f54a7ba | |
| parent | 78da0ea8d6d7c311763f5b2675216c0ff4106f9a (diff) | |
| download | nixlib-4941b96f0ce45bcc9c922e9a219aa2792753a09a.tar nixlib-4941b96f0ce45bcc9c922e9a219aa2792753a09a.tar.gz nixlib-4941b96f0ce45bcc9c922e9a219aa2792753a09a.tar.bz2 nixlib-4941b96f0ce45bcc9c922e9a219aa2792753a09a.tar.lz nixlib-4941b96f0ce45bcc9c922e9a219aa2792753a09a.tar.xz nixlib-4941b96f0ce45bcc9c922e9a219aa2792753a09a.tar.zst nixlib-4941b96f0ce45bcc9c922e9a219aa2792753a09a.zip | |
eval fix
| -rw-r--r-- | nixos/modules/config/pulseaudio.nix | 5 | ||||
| -rw-r--r-- | nixos/tests/installer.nix | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 737f0abc52f0..8b38489a8c19 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -12,7 +12,7 @@ let # Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps # using 32bit alsa on 64bit linux. - enable32BitAlsaPlugins = stdenv.isx86_64 && (pkgs_i686.alsaLib != null); + enable32BitAlsaPlugins = stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.pulseaudio != null); ids = config.ids; @@ -126,8 +126,7 @@ in { (mkIf cfg.enable { environment.systemPackages = [ cfg.package - (lib.optional enable32BitAlsaPlugins pkgs_i686.pulseaudio) - ]; + ] ++ lib.optionals enable32BitAlsaPlugins [ pkgs_i686.pulseaudio ]; environment.etc = singleton { target = "asound.conf"; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 165146a34792..4ee0e064c100 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -101,7 +101,7 @@ let iface = if grubVersion == 1 then "scsi" else "virtio"; qemuFlags = (if iso.system == "x86_64-linux" then "-m 768 " else "-m 512 ") + - (optionalString (iso.system == "x86_64-linux") "-cpu kvm64 ") + + (optionalString (iso.system == "x86_64-linux") "-cpu kvm64 "); hdFlags =''hda => "harddisk", hdaInterface => "${iface}", ''; in '' |