From ae9a47e8a6ba0a56217bc542864fa4f9b167363b Mon Sep 17 00:00:00 2001
From: Wez Furlong <wez@wezfurlong.org>
Date: Mon, 27 Dec 2021 10:33:41 -0700
Subject: [PATCH] fix unix build for zbus updates

---
 Cargo.lock                             | 33 ++++----------------------
 wezterm-toast-notification/Cargo.toml  |  2 +-
 wezterm-toast-notification/src/dbus.rs |  3 +--
 3 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 78c4624a9..5e1e3d7d7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4896,7 +4896,7 @@ dependencies = [
  "windows",
  "xml-rs",
  "zbus",
- "zvariant 2.10.0",
+ "zvariant",
 ]
 
 [[package]]
@@ -5202,7 +5202,7 @@ dependencies = [
  "static_assertions",
  "zbus_macros",
  "zbus_names",
- "zvariant 3.0.0",
+ "zvariant",
 ]
 
 [[package]]
@@ -5226,7 +5226,7 @@ checksum = "ae1f142d242d6854815a8c5c2aea83d9508f72f5757d0a137c21ef4b07bfee66"
 dependencies = [
  "serde",
  "static_assertions",
- "zvariant 3.0.0",
+ "zvariant",
 ]
 
 [[package]]
@@ -5258,19 +5258,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "zvariant"
-version = "2.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a68c7b55f2074489b7e8e07d2d0a6ee6b4f233867a653c664d8020ba53692525"
-dependencies = [
- "byteorder",
- "libc",
- "serde",
- "static_assertions",
- "zvariant_derive 2.10.0",
-]
-
 [[package]]
 name = "zvariant"
 version = "3.0.0"
@@ -5282,19 +5269,7 @@ dependencies = [
  "libc",
  "serde",
  "static_assertions",
- "zvariant_derive 3.0.0",
-]
-
-[[package]]
-name = "zvariant_derive"
-version = "2.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ca5e22593eb4212382d60d26350065bf2a02c34b85bc850474a74b589a3de9"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
+ "zvariant_derive",
 ]
 
 [[package]]
diff --git a/wezterm-toast-notification/Cargo.toml b/wezterm-toast-notification/Cargo.toml
index 2d918d107..71b823e6e 100644
--- a/wezterm-toast-notification/Cargo.toml
+++ b/wezterm-toast-notification/Cargo.toml
@@ -14,7 +14,7 @@ log = "0.4"
 [target.'cfg(all(not(windows), not(target_os="macos")))'.dependencies]
 serde = {version="1.0", features = ["derive"]}
 zbus = "2.0.0-beta.7"
-zvariant = "2.0"
+zvariant = "3.0"
 async-std = "1.4"
 futures-util = "0.3"
 
diff --git a/wezterm-toast-notification/src/dbus.rs b/wezterm-toast-notification/src/dbus.rs
index 7ac8f37e3..8eb1779b2 100644
--- a/wezterm-toast-notification/src/dbus.rs
+++ b/wezterm-toast-notification/src/dbus.rs
@@ -6,8 +6,7 @@ use futures_util::stream::{abortable, StreamExt};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use zbus::dbus_proxy;
-use zvariant::derive::Type;
-use zvariant::Value;
+use zvariant::{Type, Value};
 
 #[derive(Debug, Type, Serialize, Deserialize)]
 pub struct ServerInformation {