Merge branch 'wayland_changes' into 'master'

Couple of wayland related changes

See merge request redox-os/redox!1998

config/wayland.toml

@@ -68,10 +68,7 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/
 cosmic-comp wayland-session
 
 # For smallvil (easier to debug)
-#export WAYLAND_DISPLAY=wayland-1
-#smallvil &
-#sleep 2
-#wayland-session
+#smallvil -c wayland-session&
 """
 
 [[files]]

recipes/wip/wayland/anvil/recipe.toml

@@ -1,21 +1,14 @@
 #TODO not compiled or tested
 [source]
-git = "https://github.com/Smithay/smithay"
+same_as = "../smallvil"
+
 [build]
+template = "cargo"
 dependencies = [
+    "libffi",
     "libwayland",
     "libxkbcommon",
 ]
-template = "custom"
-script = """
-package=anvil
-"${COOKBOOK_CARGO}" build \
-            --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
-            --package "${package}" \
-            --release
-            --winit
-        mkdir -pv "${COOKBOOK_STAGE}/usr/bin"
-        cp -v \
-            "target/${TARGET}/release/${package}" \
-            "${COOKBOOK_STAGE}/usr/bin/${package}"
-"""
+cargopackages = [
+    "anvil"
+]