vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'build-fixes' into 'master'

Browse source 
Fix current build state

See merge request redox-os/redox!1532
This commit is contained in:
Jeremy Soller 2024-12-24 14:08:29 +00:00
parent b812780a54 2e6f805bc9
commit d06d78c23f
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/desktop.toml
View file

@ -22,7 +22,7 @@ orbdata = {}
orbital = {} orbital = {}
orbutils = {} orbutils = {}
pop-icon-theme = {} pop-icon-theme = {}
rustpython = {} # rustpython = {} #TODO ensure RustPython builds with our toolchain
shared-mime-info = {} shared-mime-info = {}
[[files]] [[files]]

2
cookbook

@ -1 +1 @@
Subproject commit 4eff119dd598d19ab1db1518759d3694b8edd98e Subproject commit 12d797304ff60a6dd50d719f360e2b961219cdf8

1
podman/redox-base-containerfile
View file

@ -42,7 +42,6 @@ RUN useradd --create-home --no-log-init --uid _UID_ poduser \
libpng-dev \ libpng-dev \
libsdl1.2-dev \ libsdl1.2-dev \
libsdl2-ttf-dev \ libsdl2-ttf-dev \
libtool \
llvm \ llvm \
lua5.4 \ lua5.4 \
lzip \ lzip \