fixing hyprland packages

This commit is contained in:
Matthew Stobbs
2025-03-10 22:00:58 -06:00
parent 2e885b31ac
commit 9e68ad9758
9 changed files with 20 additions and 14 deletions

View File

@@ -1,8 +1,8 @@
- name: Set hyperland-protocols config - name: Set hyprland-protocols config
ansible.builtin.set_fact: ansible.builtin.set_fact:
hyprland_protocols: hyprland_protocols:
vers: "{{ pkgconfig.hyprland_protocols.version }}" vers: "{{ pkgconfig.hyprland_protocols.version }}"
repo: "{{ pkgconfig.hyprland_protocols.repo }}" repo: "{{ pkgconfig.hyprland_protocols.repo }}"
build_deps: "{{ pkgconfig.hyprland_protocols.build_deps[ansible_os_family] }}" build_deps: "{{ pkgconfig.hyprland_protocols.build_deps[ansible_os_family] }}"
installed_files: "{{ pkgconfig.hyprland_protocols.build_installed_files }}" installed_files: "{{ pkgconfig.hyprland_protocols.build_installed_files }}"
git_path: "{{ d_tempdir.path }}/hyperland-protocols" git_path: "{{ d_tempdir.path }}/hyprland-protocols"

View File

@@ -1,6 +1,5 @@
# vim: set filetype=yaml.ansible : # vim: set filetype=yaml.ansible :
--- ---
- name: Install flatpaks on Linux Systems - name: Install flatpaks on Linux Systems
when: when:
- pkg_flatpak|length > 0 - pkg_flatpak|length > 0

View File

@@ -45,6 +45,12 @@
ansible.builtin.set_fact: ansible.builtin.set_fact:
pkg_sys: "{{ pkg_sys + ['gnu-tar', 'virtualenv'] }}" pkg_sys: "{{ pkg_sys + ['gnu-tar', 'virtualenv'] }}"
- name: Add needed Alpine packages
when:
- ansible_os_family == 'Alpine'
ansible.builtin.set_fact:
pkg_sys: "{{ pkg_sys + ['tar', 'unzip'] }}"
- name: Install sys_pkgs list using system package manager - name: Install sys_pkgs list using system package manager
become: "{{ sys_pkg_become }}" become: "{{ sys_pkg_become }}"
ansible.builtin.package: ansible.builtin.package:

View File

@@ -22,7 +22,7 @@
- Depend zig - Depend zig
changed_when: true changed_when: true
ansible.builtin.set_fact: ansible.builtin.set_fact:
pkg_src: "{{ pkg_src + [ghostty.pkg] }}" pkg_src: "{{ pkg_src + ghostty.pkg }}"
- name: Append ghostty to pkg_appimage - name: Append ghostty to pkg_appimage
when: when:
@@ -42,13 +42,13 @@
- Depend terra repo - Depend terra repo
changed_when: true changed_when: true
ansible.builtin.set_fact: ansible.builtin.set_fact:
pkg_sys: "{{ pkg_sys + [ghostty.pkg] }}" pkg_sys: "{{ pkg_sys + ghostty.pkg }}"
- name: Append ghostty to pkg_cask - name: Append ghostty to pkg_cask
when: when:
- ghostty.method == 'brew' - ghostty.method == 'brew'
ansible.builtin.set_fact: ansible.builtin.set_fact:
pkg_cask: "{{ pkg_cask + [ghostty.pkg] }}" pkg_cask: "{{ pkg_cask + ghostty.pkg }}"
- name: Set ghostty_configured - name: Set ghostty_configured
ansible.builtin.set_fact: ansible.builtin.set_fact:

View File

@@ -2,19 +2,19 @@
--- ---
- name: Remove existing install - name: Remove existing install
when: when:
- hyprland_protocols.clean - hyprland_clean
become: true become: true
loop: "{{ hyprland_protocols.installed_files }}" loop: "{{ hyprland_protocols.installed_files }}"
loop_control: loop_control:
loop_var: file loop_var: file
ansible.builtin.file: ansible.builtin.file:
state: absent state: absent
path: "{{ hyprland_protocols.prefix }}/{{ file }}" path: "{{ hyprland.prefix }}/{{ file }}"
- name: Check if hyprland-protocols is installed - name: Check if hyprland-protocols is installed
register: stat_hyprland_protocols_inst register: stat_hyprland_protocols_inst
ansible.builtin.stat: ansible.builtin.stat:
path: "{{ hyprland_protocols.prefix }}/share/hyprland-protocols/protocols/hyprland-ctm-control-v1.xml" path: "{{ hyprland.prefix }}/share/hyprland-protocols/protocols/hyprland-ctm-control-v1.xml"
- name: Build and install hyprland-protocols - name: Build and install hyprland-protocols
when: when:
@@ -41,7 +41,7 @@
- name: Install hyprland-protocols - name: Install hyprland-protocols
become: true become: true
ansible.builtin.command: ansible.builtin.command:
creates: "{{ hyprland_protocols.prefix }}/share/hyprland-protocols/protocols/hyprland-ctm-control-v1.xml" creates: "{{ hyprland.prefix }}/share/hyprland-protocols/protocols/hyprland-ctm-control-v1.xml"
chdir: "{{ hyprland_protocols.git_path }}" chdir: "{{ hyprland_protocols.git_path }}"
argv: argv:
- meson - meson

View File

@@ -1,6 +1,6 @@
- name: Remove existing install - name: Remove existing install
when: when:
- hyprpolkitagent_clean - hyprland_clean
become: "{{ ext_become }}" become: "{{ ext_become }}"
loop: "{{ hyprpolkitagent.installed_files }}" loop: "{{ hyprpolkitagent.installed_files }}"
loop_control: loop_control:

View File

@@ -34,7 +34,7 @@
- cmake - cmake
- --no-warn-unused-cli - --no-warn-unused-cli
- -DCMAKE_BUILD_TYPE=Release - -DCMAKE_BUILD_TYPE=Release
- -dDCMAKE_INSTALL_PREFIX={{ sdbus_cpp_2.prefix }} - -DCMAKE_INSTALL_PREFIX={{ sdbus_cpp_2.prefix }}
- -S - -S
- . - .
- -B - -B
@@ -42,7 +42,7 @@
- name: Build sdbus-cpp-2 - name: Build sdbus-cpp-2
ansible.builtin.command: ansible.builtin.command:
creates: "{{ sdbus_cpp_2.git_path }}/build/Makefile" creates: "{{ sdbus_cpp_2.git_path }}/build/libsdbus-c++.so"
chdir: "{{ sdbus_cpp_2.git_path }}" chdir: "{{ sdbus_cpp_2.git_path }}"
argv: argv:
- cmake - cmake

View File

@@ -1,6 +1,6 @@
hyprland_protocols: hyprland_protocols:
version: v0.6.2 version: v0.6.2
repo: "{{ hyprgitbase }}/hyperland-protocols" repo: "{{ hyprgitbase }}/hyprland-protocols"
build_deps: build_deps:
RedHat: RedHat:
- meson - meson

View File

@@ -7,6 +7,7 @@ hyprpolkitagent:
- polkit-qt6-1-devel - polkit-qt6-1-devel
Alpine: Alpine:
- polkit-dev - polkit-dev
- polkit-qt-dev
- polkit-qt6 - polkit-qt6
build_installed_files: build_installed_files:
- libexec/hyprpolkitagent - libexec/hyprpolkitagent