diff --git a/pkgs/applications/window-managers/eww/Cargo.lock.patch b/pkgs/applications/window-managers/eww/Cargo.lock.patch deleted file mode 100644 index 571592b1d698..000000000000 --- a/pkgs/applications/window-managers/eww/Cargo.lock.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -406,7 +406,7 @@ dependencies = [ - - [[package]] - name = "eww" --version = "0.3.0" -+version = "0.4.0" - dependencies = [ - "anyhow", - "bincode", diff --git a/pkgs/applications/window-managers/eww/default.nix b/pkgs/applications/window-managers/eww/default.nix index 4e74fcd26e77..1a728f39f8b5 100644 --- a/pkgs/applications/window-managers/eww/default.nix +++ b/pkgs/applications/window-managers/eww/default.nix @@ -11,25 +11,25 @@ rustPlatform.buildRustPackage rec { pname = "eww"; - version = "0.4.0"; + version = "unstable-2023-06-10"; src = fetchFromGitHub { owner = "elkowar"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-wzgWx3QxZvCAzRKLFmo/ru8hsIQsEDNeb4cPdlEyLxE="; + repo = "eww"; + rev = "25e50eda46379bccd8a7887c18ee35833e0460e8"; + hash = "sha256-8e6gHSg6FDp6nU5v89D44Tqb1lR5aQpS0lXOVqzoUS4="; }; - cargoSha256 = "sha256-9RfYDF31wFYylhZv53PJpZofyCdMiUiH/nhRB2Ni/Is="; - - cargoPatches = [ ./Cargo.lock.patch ]; + cargoHash = "sha256-dC7yVJdR7mO0n+sxWwigM1Q4tbDv5ZuOINHHlUIPdA0="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 gdk-pixbuf ] ++ lib.optional withWayland gtk-layer-shell; - buildNoDefaultFeatures = withWayland; - buildFeatures = lib.optional withWayland "wayland"; + buildNoDefaultFeatures = true; + buildFeatures = [ + (if withWayland then "wayland" else "x11") + ]; cargoBuildFlags = [ "--bin" "eww" ];