Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/utah.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ packages = [
# their side after the jsoncpp bump, not a gap this image has to answer for,
# and nothing in build-gnome-extensions.sh invokes cmake: it runs make, meson,
# unzip and glib-compile-schemas. Restore this entry once Hummingbird rebuilds
# cmake, or if an extension ever needs it.
# cmake, or if an extension ever needs it. sassc was dropped alongside: dash-to-dock's
# stylesheet.css now ships precompiled, so no build step needs a Sass compiler.
packages = [
"dbus-devel",
"glib2-devel",
"meson",
"sassc",
"unzip",
]

Expand Down
15 changes: 13 additions & 2 deletions scripts/build-gnome-extensions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,19 @@ mv /usr/share/gnome-shell/extensions/tmp/caffeine/caffeine@patapon.info /usr/sha
glib-compile-schemas --strict /usr/share/gnome-shell/extensions/caffeine@patapon.info/schemas

# Dash to Dock
make -C /usr/share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com
glib-compile-schemas --strict /usr/share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com/schemas
# Upstream's Makefile renders stylesheet.css from _stylesheet.scss with sassc,
# which neither the Hummingbird base nor the Utah package repository provides
# (see [unavailable] in packages/utah.toml). The stylesheet is deterministic
# for the pinned submodule ref, so Utah ships it precompiled. Guard on the
# scss digest so a submodule bump cannot silently ship a stale stylesheet.
dtd_dir="/usr/share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com"
dtd_scss_sha="75892eff2b2d98fc94046a1d1a0a0defb4daaa8f0cadee251205e353ea048e0f"
if ! echo "${dtd_scss_sha} ${dtd_dir}/_stylesheet.scss" | sha256sum --check --strict --status; then
echo "dash-to-dock _stylesheet.scss no longer matches the precompiled stylesheet; re-render system_files/shared/usr/share/utah/dash-to-dock-stylesheet.css" >&2
exit 1
fi
install -m 0644 /usr/share/utah/dash-to-dock-stylesheet.css "${dtd_dir}/stylesheet.css"
glib-compile-schemas --strict "${dtd_dir}/schemas"

# Gradia Capture
bash /usr/share/gnome-shell/extensions/gradia-integration@alexandervanhee.github.io/build.sh
Expand Down
2 changes: 1 addition & 1 deletion scripts/configure-services.sh
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,6 @@ rm -rf /tmp/uupd

# Build-only extension tooling is not part of the desktop image.
DNF="$(command -v dnf5 || command -v dnf)"
"$DNF" -y remove --no-autoremove dbus-devel glib2-devel meson sassc unzip
"$DNF" -y remove --no-autoremove dbus-devel glib2-devel meson unzip

echo "Utah desktop service configuration complete"
Loading
Loading