public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eval fix

Browse Source
This commit is contained in:
Domen Kožar 2014-10-07 21:02:18 +02:00
parent 78da0ea8d6
commit 4941b96f0c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/config/pulseaudio.nix
View File

@ -12,7 +12,7 @@ let
# Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps # Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps
# using 32bit alsa on 64bit linux. # 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; ids = config.ids;
@ -126,8 +126,7 @@ in {
(mkIf cfg.enable { (mkIf cfg.enable {
environment.systemPackages = [ environment.systemPackages = [
cfg.package cfg.package
(lib.optional enable32BitAlsaPlugins pkgs_i686.pulseaudio) ] ++ lib.optionals enable32BitAlsaPlugins [ pkgs_i686.pulseaudio ];
];
environment.etc = singleton { environment.etc = singleton {
target = "asound.conf"; target = "asound.conf";

2
nixos/tests/installer.nix
View File

@ -101,7 +101,7 @@ let
iface = if grubVersion == 1 then "scsi" else "virtio"; iface = if grubVersion == 1 then "scsi" else "virtio";
qemuFlags = qemuFlags =
(if iso.system == "x86_64-linux" then "-m 768 " else "-m 512 ") + (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}", ''; hdFlags =''hda => "harddisk", hdaInterface => "${iface}", '';
in in
'' ''