Skip to content

Commit a037432

Browse files
committed
flatpak: move to Zig 0.14.0
Build Zig as a dependency until upstream updated the extension
1 parent 6abee20 commit a037432

File tree

3 files changed

+33
-2
lines changed

3 files changed

+33
-2
lines changed

Diff for: flatpak/com.mitchellh.ghostty.Devel.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ modules:
3939
- name: ghostty
4040
buildsystem: simple
4141
build-options:
42-
append-path: /usr/lib/sdk/ziglang
42+
# XXX: Use manually installed zig until flathub update theirs
43+
#
44+
# append-path: /usr/lib/sdk/ziglang
45+
append-path: /app/lib/sdk/ziglang
46+
4347
build-commands:
4448
- zig build
4549
-Doptimize=Debug
@@ -50,6 +54,9 @@ modules:
5054
--prefix /app
5155
--search-prefix /app
5256
--system $PWD/vendor/p
57+
58+
# XXX: Workaround for https://github.com/jcollie/ghostty-gobject/issues/3
59+
- chmod -R u+w vendor/p/gobject-*
5360
sources:
5461
- type: dir
5562
path: ..

Diff for: flatpak/com.mitchellh.ghostty.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ modules:
3434
- name: ghostty
3535
buildsystem: simple
3636
build-options:
37-
append-path: /usr/lib/sdk/ziglang
37+
# XXX: Use manually installed zig until flathub update theirs
38+
#
39+
# append-path: /usr/lib/sdk/ziglang
40+
append-path: /app/lib/sdk/ziglang
3841
build-commands:
3942
- zig build
4043
-Doptimize=ReleaseFast

Diff for: flatpak/dependencies.yml

+21
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,27 @@ buildsystem: simple
33
build-commands:
44
- true
55
modules:
6+
# XXX: Temporary until https://github.com/flathub/org.freedesktop.Sdk.Extension.ziglang/issues/31 is resolved
7+
- name: zig
8+
buildsystem: simple
9+
cleanup:
10+
- '*'
11+
build-commands:
12+
- mkdir -p /app/lib/sdk
13+
- cp -r . /app/lib/sdk/ziglang
14+
sources:
15+
- type: archive
16+
url: https://ziglang.org/download/0.14.0/zig-linux-x86_64-0.14.0.tar.xz
17+
sha256: 473ec26806133cf4d1918caf1a410f8403a13d979726a9045b421b685031a982
18+
only-arches:
19+
- x86_64
20+
21+
- type: archive
22+
url: https://ziglang.org/download/0.14.0/zig-linux-aarch64-0.14.0.tar.xz
23+
sha256: ab64e3ea277f6fc5f3d723dcd95d9ce1ab282c8ed0f431b4de880d30df891e4f
24+
only-arches:
25+
- aarch64
26+
627
- name: bzip2-redirect
728
buildsystem: simple
829
build-commands:

0 commit comments

Comments
 (0)