Switch to stable hyprland related packages (#1080)

This commit is contained in:
clsty 2025-02-06 21:22:31 +08:00
parent db1cc548ea
commit cf52b63ed5
5 changed files with 27 additions and 22 deletions

View file

@ -0,0 +1,18 @@
pkgname=illogical-impulse-hyprland
pkgver=1.0
pkgrel=1
pkgdesc='Illogical Impulse Hyprland relatated packages'
arch=(any)
license=(None)
depends=(
hyprutils
hyprlang
hypridle
hyprland-qt-support
hyprland-qtutils
hyprlock
xdg-desktop-portal-hyprland
hyprcursor
hyprwayland-scanner
hyprland
)

View file

@ -7,6 +7,6 @@ license=(None)
depends=(
xdg-desktop-portal
xdg-desktop-portal-gtk
xdg-desktop-portal-hyprland-git
xdg-desktop-portal-hyprland
)

View file

@ -8,12 +8,12 @@ depends=(
dart-sass
python-pywayland
python-psutil
hypridle-git
hyprutils-git
hyprlock-git
hypridle
hyprutils
hyprlock
wlogout
wl-clipboard
hyprpicker-git
hyprpicker
anyrun-git
)

View file

@ -116,13 +116,15 @@ install-local-pkgbuild() {
}
# Install core dependencies from the meta-packages
try sudo pacman -R illogical-impulse-{microtex,pymyc-aur}
try sudo pacman -Rdd {hyprutils,hyprlang,hypridle,hyprland-qt-support,hyprland-qtutils,hyprlock,xdg-desktop-portal-hyprland,hyprcursor,hyprwayland-scanner,hyprland}-git
metapkgs=(./arch-packages/illogical-impulse-{audio,python,backlight,basic,fonts-themes,gnome,gtk,portal,screencapture,widgets})
metapkgs+=(./arch-packages/illogical-impulse-ags)
metapkgs+=(./arch-packages/illogical-impulse-hyprland)
metapkgs+=(./arch-packages/illogical-impulse-microtex-git)
metapkgs+=(./arch-packages/illogical-impulse-oneui4-icons-git)
[[ -f /usr/share/icons/Bibata-Modern-Classic/index.theme ]] || \
metapkgs+=(./arch-packages/illogical-impulse-bibata-modern-classic-bin)
try sudo pacman -R illogical-impulse-{microtex,pymyc-aur}
for i in "${metapkgs[@]}"; do
metainstallflags="--needed"
@ -134,19 +136,6 @@ done
showfun install-python-packages
v install-python-packages
# Why need cleanbuild? see https://github.com/end-4/dots-hyprland/issues/389#issuecomment-2040671585
# Why install deps by running a seperate command? see pinned comment of https://aur.archlinux.org/packages/hyprland-git
case $SKIP_HYPR_AUR in
true) sleep 0;;
*)
hyprland_installflags="-S"
$ask || hyprland_installflags="$hyprland_installflags --noconfirm"
v yay $hyprland_installflags --asdeps hyprutils-git hyprlang-git hyprcursor-git hyprwayland-scanner-git
v yay $hyprland_installflags --answerclean=a hyprland-git
;;
esac
## Optional dependencies
if pacman -Qs ^plasma-browser-integration$ ;then SKIP_PLASMAINTG=true;fi
case $SKIP_PLASMAINTG in

View file

@ -14,7 +14,6 @@ If no option is specified, run default install process.
-c, --clean Clean the build cache first
-s, --skip-sysupdate Skip \"sudo pacman -Syu\"
--skip-hyprland Skip installing the config for Hyprland
--skip-hypr-aur Skip installing hyprland-git
--skip-fish Skip installing the config for Fish
--skip-plasmaintg Skip installing plasma-browser-integration
--skip-miscconf Skip copying the dirs and files to \".configs\" except for
@ -32,7 +31,7 @@ cleancache(){
# `man getopt` to see more
para=$(getopt \
-o hfk:cs \
-l help,force,fontset:,deplistfile:,clean,skip-sysupdate,skip-fish,skip-hyprland,skip-hypr-aur,skip-plasmaintg,skip-miscconf \
-l help,force,fontset:,deplistfile:,clean,skip-sysupdate,skip-fish,skip-hyprland,skip-plasmaintg,skip-miscconf \
-n "$0" -- "$@")
[ $? != 0 ] && echo "$0: Error when getopt, please recheck parameters." && exit 1
#####################################################################################
@ -60,7 +59,6 @@ while true ; do
-f|--force) ask=false;shift;;
-s|--skip-sysupdate) SKIP_SYSUPDATE=true;shift;;
--skip-hyprland) SKIP_HYPRLAND=true;shift;;
--skip-hypr-aur) SKIP_HYPR_AUR=true;shift;;
--skip-fish) SKIP_FISH=true;shift;;
--skip-miscconf) SKIP_MISCCONF=true;shift;;
--skip-plasmaintg) SKIP_PLASMAINTG=true;shift;;