summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorElis Hirwing <elis@hirwing.se>2019-02-22 21:24:12 +0100
committerGitHub <noreply@github.com>2019-02-22 21:24:12 +0100
commit5f00002a3cd1a4d91e57dad1eafc7fd7b0b0b322 (patch)
treeaa139ede3a52a5f6b072f8d2223ba9ec733c6a73 /nixos
parent0809782c73da7a412aae0b76f564ad3e1f7ba218 (diff)
parentd1c2805eb5db481295d983700fb5123a9b5db809 (diff)
downloadnixpkgs-5f00002a3cd1a4d91e57dad1eafc7fd7b0b0b322.tar
nixpkgs-5f00002a3cd1a4d91e57dad1eafc7fd7b0b0b322.tar.gz
nixpkgs-5f00002a3cd1a4d91e57dad1eafc7fd7b0b0b322.tar.bz2
nixpkgs-5f00002a3cd1a4d91e57dad1eafc7fd7b0b0b322.tar.lz
nixpkgs-5f00002a3cd1a4d91e57dad1eafc7fd7b0b0b322.tar.xz
nixpkgs-5f00002a3cd1a4d91e57dad1eafc7fd7b0b0b322.tar.zst
nixpkgs-5f00002a3cd1a4d91e57dad1eafc7fd7b0b0b322.zip
Merge pull request #56167 from etu/iso-with-audio
installer: Enable pulseaudio in all graphical iso's
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix4
-rw-r--r--nixos/modules/profiles/graphical.nix4
2 files changed, 8 insertions, 0 deletions
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
index 228ef371d25..917b3758d38 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
@@ -31,6 +31,10 @@ with lib;
   # there is no power management backend such as upower).
   powerManagement.enable = true;
 
+  # Enable sound in graphical iso's.
+  hardware.pulseaudio.enable = true;
+  hardware.pulseaudio.systemWide = true; # Needed since we run plasma as root.
+
   environment.systemPackages = [
     # Include gparted for partitioning disks.
     pkgs.gparted
diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
index fba756391b1..649f5564ac6 100644
--- a/nixos/modules/profiles/graphical.nix
+++ b/nixos/modules/profiles/graphical.nix
@@ -14,5 +14,9 @@
     libinput.enable = true; # for touchpad support on many laptops
   };
 
+  # Enable sound in virtualbox appliances.
+  hardware.pulseaudio.enable = true;
+  hardware.pulseaudio.systemWide = true; # Needed since we run plasma as root.
+
   environment.systemPackages = [ pkgs.glxinfo pkgs.firefox ];
 }