feat: support browser installation on Fedora

ben-grande · Jun 28, 2024 · 077b21d · 077b21d
1 parent 72068e8
commit 077b21d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/salt/browser/install-common.sls b/salt/browser/install-common.sls
@@ -21,8 +21,23 @@ include:
       - qubes-core-agent-networking
       - ca-certificates
       - qubes-core-agent-thunar
-      - thunar
       - zenity
-      - libgdk-pixbuf2.0-bin
+
+{% set pkg = {
+  'Debian': {
+    'pkg': ['thunar', 'libgdk-pixbuf2.0-bin'],
+  },
+  'RedHat': {
+    'pkg': ['Thunar', 'gdk-pixbuf2'],
+  },
+}.get(grains.os_family) -%}
+
+"{{ slsdotpath }}-installed-common-os-specific":
+  pkg.installed:
+    - require:
+      - sls: utils.tools.common.update
+    - install_recommends: False
+    - skip_suggestions: True
+    - pkgs: {{ pkg.pkg|sequence|yaml }}
 
 {% endif -%}
diff --git a/salt/sys-audio/install-client.sls b/salt/sys-audio/install-client.sls
@@ -20,17 +20,17 @@ include:
     - skip_suggestions: True
     - pkgs:
       - pipewire-qubes
-      - pipewire-pulse
-      - pipewire-libcamera
       - wireplumber
       - rtkit
 
 {% set pkg = {
     'Debian': {
-      'pkg': ['dbus-user-session', 'libpam-systemd'],
+      'pkg': ['dbus-user-session', 'libpam-systemd', 'pipewire-pulse',
+              'pipewire-libcamera'],
     },
     'RedHat': {
-      'pkg': ['dbus', 'systemd-pam'],
+      'pkg': ['dbus', 'systemd-pam', 'pipewire-pulseaudio',
+              'pipewire-plugin-libcamera'],
     },
 }.get(grains.os_family) -%}