diff --git a/sdata/dist-fedora/install-deps.sh b/sdata/dist-fedora/install-deps.sh index 21022a249..409156951 100644 --- a/sdata/dist-fedora/install-deps.sh +++ b/sdata/dist-fedora/install-deps.sh @@ -12,7 +12,7 @@ case $SKIP_SYSUPDATE in *) v sudo dnf upgrade --refresh -y;; esac -# Group installation +# Development-tools installation v sudo dnf install @development-tools fedora-packager rpmdevtools fonts-rpm-macros -y # COPR repositories @@ -69,7 +69,7 @@ v sudo dnf install python3{,.12}{,-devel} -y # Quickshell-git quickshell_deps=( - quickshell-git qt6-qtdeclarative qt6-qtbase jemalloc qt6-qtsvg pipewire-libs + qt6-qtdeclarative qt6-qtbase jemalloc qt6-qtsvg pipewire-libs libxcb wayland-devel qt6-qtwayland qt5-qtwayland libdrm breakpad ) # NOTE: Below are custom dependencies of illogical-impulse @@ -80,6 +80,15 @@ quickshell_custom_deps=( ) v sudo dnf install "${quickshell_deps[@]}" -y v sudo dnf install "${quickshell_custom_deps[@]}" -y +# Dynamically control the version of quickshell +qs_version=$(dnf list --showduplicates quickshell-git 2>/dev/null | + grep -E "\.git${_qs_shortcommit}(-|$)" | + awk '{print $2}' | + sort -V | + tail -n1) +v sudo dnf versionlock delete quickshell-git 2>/dev/null +v sudo dnf install quickshell-git-${qs_version} +v sudo dnf versionlock add quickshell-git # Screencapture v sudo dnf install hyprshot slurp swappy tesseract tesseract-langpack-eng tesseract-langpack-chi_sim wf-recorder -y diff --git a/sdata/lib/environment-variables.sh b/sdata/lib/environment-variables.sh index 0f3d6acf0..b2153ae0a 100644 --- a/sdata/lib/environment-variables.sh +++ b/sdata/lib/environment-variables.sh @@ -25,3 +25,7 @@ STY_RST='\e[00m' # Used by register_temp_file() declare -a TEMP_FILES_TO_CLEANUP=() + +# Pinned commit for quickshell +_qs_commit='db1777c20b936a86528c1095cbcb1ebd92801402' +_qs_shortcommit=$(echo ${_qs_commit} | cut -c1-7)