Merge branch 'master' of https://gitlab.redox-os.org/redox-os/cookbook

recipes/hematite/recipe.sh

@@ -1,16 +0,0 @@
-GIT=https://gitlab.redox-os.org/redox-os/hematite.git
-GIT_UPSTREAM=https://github.com/PistonDevelopers/hematite.git
-BUILD_DEPENDS=(llvm mesa zlib)
-BRANCH=redox
-
-function recipe_build {
-    sysroot="$(realpath ../sysroot)"
-    cp -p "$ROOT/Xargo.toml" "Xargo.toml"
-    set -x
-    xargo rustc --target "$TARGET" --release ${CARGOFLAGS} \
-        -- \
-        -L "${sysroot}/lib" \
-        -C link-args="$("${PKG_CONFIG}" --libs osmesa) -lglapi -lz -lstdc++ -lc -lgcc"
-    set +x
-    skip=1
-}

recipes/hematite/recipe.toml

@@ -0,0 +1,23 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/hematite.git"
+branch = "redox"
+upstream = "https://github.com/PistonDevelopers/hematite.git"
+
+[build]
+template = "custom"
+dependencies = [
+    "llvm",
+    "mesa",
+    "zlib"
+]
+script = """
+cargo rustc \
+    --target "$TARGET" \
+    --release \
+    --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
+    -- \
+    -L "${COOKBOK_SYSROOT}/lib" \
+    -C link-args="-Wl,-Bstatic $("${TARGET}-pkg-config" --libs osmesa) -lz -lstdc++ -lc -lgcc"
+mkdir -pv "${COOKBOOK_STAGE}/bin"
+cp -v "target/${TARGET}/release/hematite" "${COOKBOOK_STAGE}/bin/hematite"
+"""

recipes/noto-color-emoji/recipe.toml

@@ -0,0 +1,10 @@
+[source]
+git = "https://github.com/googlefonts/noto-emoji.git"
+
+[build]
+template = "custom"
+script = """
+DEST="${COOKBOOK_STAGE}/ui/fonts/Emoji/Noto"
+mkdir -pv "${DEST}"
+cp -v "${COOKBOOK_SOURCE}/fonts/NotoColorEmoji.ttf" "${DEST}"
+"""