diff --git a/recipes/iced/recipe.toml b/recipes/iced/recipe.toml index c92d017f72a515d1a140e4424e4c4ece5bcc66f8..447f93d5f3657358a2b60ead1d77dc51e3a3da92 100644 --- a/recipes/iced/recipe.toml +++ b/recipes/iced/recipe.toml @@ -4,28 +4,17 @@ branch = "redox" [build] template = "custom" -dependencies = [ - "llvm", - "mesa", - "zlib" -] script = """ EXAMPLES=( - game_of_life - solar_system styling - tour ) set -x for example in "${EXAMPLES[@]}" do - ${COOKBOOK_CARGO} rustc \ + ${COOKBOOK_CARGO} build \ --release \ --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \ - --package "${example}" \ - -- \ - -L "${COOKBOOK_SYSROOT}/lib" \ - -C link-args="-Wl,-Bstatic $("${TARGET}-pkg-config" --libs osmesa) -lz -lstdc++ -lc -lgcc" + --package "${example}" mkdir -pv "${COOKBOOK_STAGE}/bin" cp -v "target/${TARGET}/release/${example}" "${COOKBOOK_STAGE}/bin/iced_${example}" done diff --git a/recipes/libcosmic/recipe.toml b/recipes/libcosmic/recipe.toml index 426d7619a1aa7ce677623d23bdaf27e802fd540e..3832b9f985d495997e08b16d378f125e70421846 100644 --- a/recipes/libcosmic/recipe.toml +++ b/recipes/libcosmic/recipe.toml @@ -4,20 +4,12 @@ branch = "redox" [build] template = "custom" -dependencies = [ - "llvm", - "mesa", - "zlib" -] script = """ set -x - ${COOKBOOK_CARGO} rustc \ + ${COOKBOOK_CARGO} build \ --release \ --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \ - --package cosmic \ - -- \ - -L "${COOKBOOK_SYSROOT}/lib" \ - -C link-args="-Wl,-Bstatic $("${PKG_CONFIG}" --libs osmesa) -lz -lstdc++ -lc -lgcc" + --package cosmic mkdir -pv "${COOKBOOK_STAGE}/bin" cp -v "target/${TARGET}/release/cosmic" "${COOKBOOK_STAGE}/bin/libcosmic" """