From 9e68ad9758b2cb120d5dc11195a0e2e94f82a0cc Mon Sep 17 00:00:00 2001 From: Matthew Stobbs Date: Mon, 10 Mar 2025 22:00:58 -0600 Subject: [PATCH] fixing hyprland packages --- tasks/config/hyprland_protocols.yml | 4 ++-- tasks/linux.yml | 1 - tasks/main.yml | 6 ++++++ tasks/pkgs/ghostty.yml | 6 +++--- tasks/src/hyprland_protocols.yml | 8 ++++---- tasks/src/hyprpolkitagent.yml | 2 +- tasks/src/sdbus_cpp_2.yml | 4 ++-- vars/pkgs/hyprland_protocols.yml | 2 +- vars/pkgs/hyprpolkitagent.yml | 1 + 9 files changed, 20 insertions(+), 14 deletions(-) diff --git a/tasks/config/hyprland_protocols.yml b/tasks/config/hyprland_protocols.yml index ac5d9a4..f18dfc0 100644 --- a/tasks/config/hyprland_protocols.yml +++ b/tasks/config/hyprland_protocols.yml @@ -1,8 +1,8 @@ -- name: Set hyperland-protocols config +- name: Set hyprland-protocols config ansible.builtin.set_fact: hyprland_protocols: vers: "{{ pkgconfig.hyprland_protocols.version }}" repo: "{{ pkgconfig.hyprland_protocols.repo }}" build_deps: "{{ pkgconfig.hyprland_protocols.build_deps[ansible_os_family] }}" installed_files: "{{ pkgconfig.hyprland_protocols.build_installed_files }}" - git_path: "{{ d_tempdir.path }}/hyperland-protocols" + git_path: "{{ d_tempdir.path }}/hyprland-protocols" diff --git a/tasks/linux.yml b/tasks/linux.yml index 86fa551..00c0379 100644 --- a/tasks/linux.yml +++ b/tasks/linux.yml @@ -1,6 +1,5 @@ # vim: set filetype=yaml.ansible : --- - - name: Install flatpaks on Linux Systems when: - pkg_flatpak|length > 0 diff --git a/tasks/main.yml b/tasks/main.yml index 678e210..f0c2f9b 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -45,6 +45,12 @@ ansible.builtin.set_fact: 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 become: "{{ sys_pkg_become }}" ansible.builtin.package: diff --git a/tasks/pkgs/ghostty.yml b/tasks/pkgs/ghostty.yml index 3a1b3f9..da04778 100644 --- a/tasks/pkgs/ghostty.yml +++ b/tasks/pkgs/ghostty.yml @@ -22,7 +22,7 @@ - Depend zig changed_when: true ansible.builtin.set_fact: - pkg_src: "{{ pkg_src + [ghostty.pkg] }}" + pkg_src: "{{ pkg_src + ghostty.pkg }}" - name: Append ghostty to pkg_appimage when: @@ -42,13 +42,13 @@ - Depend terra repo changed_when: true ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + [ghostty.pkg] }}" + pkg_sys: "{{ pkg_sys + ghostty.pkg }}" - name: Append ghostty to pkg_cask when: - ghostty.method == 'brew' ansible.builtin.set_fact: - pkg_cask: "{{ pkg_cask + [ghostty.pkg] }}" + pkg_cask: "{{ pkg_cask + ghostty.pkg }}" - name: Set ghostty_configured ansible.builtin.set_fact: diff --git a/tasks/src/hyprland_protocols.yml b/tasks/src/hyprland_protocols.yml index 291d23e..dd4a7a9 100644 --- a/tasks/src/hyprland_protocols.yml +++ b/tasks/src/hyprland_protocols.yml @@ -2,19 +2,19 @@ --- - name: Remove existing install when: - - hyprland_protocols.clean + - hyprland_clean become: true loop: "{{ hyprland_protocols.installed_files }}" loop_control: loop_var: file ansible.builtin.file: state: absent - path: "{{ hyprland_protocols.prefix }}/{{ file }}" + path: "{{ hyprland.prefix }}/{{ file }}" - name: Check if hyprland-protocols is installed register: stat_hyprland_protocols_inst 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 when: @@ -41,7 +41,7 @@ - name: Install hyprland-protocols become: true 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 }}" argv: - meson diff --git a/tasks/src/hyprpolkitagent.yml b/tasks/src/hyprpolkitagent.yml index 52038b2..e5b7e08 100644 --- a/tasks/src/hyprpolkitagent.yml +++ b/tasks/src/hyprpolkitagent.yml @@ -1,6 +1,6 @@ - name: Remove existing install when: - - hyprpolkitagent_clean + - hyprland_clean become: "{{ ext_become }}" loop: "{{ hyprpolkitagent.installed_files }}" loop_control: diff --git a/tasks/src/sdbus_cpp_2.yml b/tasks/src/sdbus_cpp_2.yml index 7e82263..cb31cf1 100644 --- a/tasks/src/sdbus_cpp_2.yml +++ b/tasks/src/sdbus_cpp_2.yml @@ -34,7 +34,7 @@ - cmake - --no-warn-unused-cli - -DCMAKE_BUILD_TYPE=Release - - -dDCMAKE_INSTALL_PREFIX={{ sdbus_cpp_2.prefix }} + - -DCMAKE_INSTALL_PREFIX={{ sdbus_cpp_2.prefix }} - -S - . - -B @@ -42,7 +42,7 @@ - name: Build sdbus-cpp-2 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 }}" argv: - cmake diff --git a/vars/pkgs/hyprland_protocols.yml b/vars/pkgs/hyprland_protocols.yml index da2e3e1..c7224a7 100644 --- a/vars/pkgs/hyprland_protocols.yml +++ b/vars/pkgs/hyprland_protocols.yml @@ -1,6 +1,6 @@ hyprland_protocols: version: v0.6.2 - repo: "{{ hyprgitbase }}/hyperland-protocols" + repo: "{{ hyprgitbase }}/hyprland-protocols" build_deps: RedHat: - meson diff --git a/vars/pkgs/hyprpolkitagent.yml b/vars/pkgs/hyprpolkitagent.yml index 8d66cdd..e4ae9f7 100644 --- a/vars/pkgs/hyprpolkitagent.yml +++ b/vars/pkgs/hyprpolkitagent.yml @@ -7,6 +7,7 @@ hyprpolkitagent: - polkit-qt6-1-devel Alpine: - polkit-dev + - polkit-qt-dev - polkit-qt6 build_installed_files: - libexec/hyprpolkitagent