refactor(deck): Use rpm-ostree module for package replacements

zelikos · Dec 22, 2024 · 2a1d0ad · 2a1d0ad
1 parent 2fdeae7
commit 2a1d0ad
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 25 deletions.
diff --git a/files/scripts/steam-install.sh b/files/scripts/steam-install.sh
@@ -12,32 +12,32 @@ curl -Lo /etc/yum.repos.d/negativo17-fedora-rar.repo https://negativo17.org/repo
 curl -Lo /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite-multilib/repo/fedora-"${OS_VERSION}"/kylegospo-bazzite-multilib-fedora-"${OS_VERSION}".repo?arch=x86_64
 
 # Ensure that needed Mesa packages are installed from bazzite-multilib
-echo "Installing Mesa packages from bazzite-multilib"
+# echo "Installing Mesa packages from bazzite-multilib"
 
-rpm-ostree override replace \
-    --experimental \
-    --from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite-multilib \
-      mesa-libxatracker \
-      mesa-libglapi \
-      mesa-dri-drivers \
-      mesa-libgbm \
-      mesa-libEGL \
-      mesa-vulkan-drivers \
-      mesa-libGL \
-      pipewire \
-      pipewire-alsa \
-      pipewire-gstreamer \
-      pipewire-jack-audio-connection-kit \
-      pipewire-jack-audio-connection-kit-libs \
-      pipewire-libs \
-      pipewire-pulseaudio \
-      pipewire-utils \
-      pipewire-plugin-libcamera \
-      bluez \
-      bluez-obexd \
-      bluez-cups \
-      bluez-libs \
-      xorg-x11-server-Xwayland
+# rpm-ostree override replace \
+#     --experimental \
+#     --from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite-multilib \
+#       mesa-libxatracker \
+#       mesa-libglapi \
+#       mesa-dri-drivers \
+#       mesa-libgbm \
+#       mesa-libEGL \
+#       mesa-vulkan-drivers \
+#       mesa-libGL \
+#       pipewire \
+#       pipewire-alsa \
+#       pipewire-gstreamer \
+#       pipewire-jack-audio-connection-kit \
+#       pipewire-jack-audio-connection-kit-libs \
+#       pipewire-libs \
+#       pipewire-pulseaudio \
+#       pipewire-utils \
+#       pipewire-plugin-libcamera \
+#       bluez \
+#       bluez-obexd \
+#       bluez-cups \
+#       bluez-libs \
+#       xorg-x11-server-Xwayland
 
 echo "Installing other Steam dependencies"
 

diff --git a/recipes/gnome/zeliblue-deck.yml b/recipes/gnome/zeliblue-deck.yml
@@ -29,6 +29,32 @@ modules:
       - source: system_files/deck
         destination: /
 
+  - type: rpm-ostree
+    replace:
+      - from-repo: https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite-multilib/repo/fedora-"${OS_VERSION}"/kylegospo-bazzite-multilib-fedora-"${OS_VERSION}".repo?arch=x86_64
+        packages:
+          - mesa-libxatracker
+          - mesa-libglapi
+          - mesa-dri-drivers
+          - mesa-libgbm
+          - mesa-libEGL
+          - mesa-vulkan-drivers
+          - mesa-libGL
+          - pipewire
+          - pipewire-alsa
+          - pipewire-gstreamer
+          - pipewire-jack-audio-connection-kit
+          - pipewire-jack-audio-connection-kit-libs
+          - pipewire-libs
+          - pipewire-pulseaudio
+          - pipewire-utils
+          - pipewire-plugin-libcamera
+          - bluez
+          - bluez-obexd
+          - bluez-cups
+          - bluez-libs
+          - xorg-x11-server-Xwayland
+
   - type: rpm-ostree
     repos:
       - https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/repo/fedora-%OS_VERSION%/kylegospo-bazzite-fedora-%OS_VERSION%.repo