diff --git a/modules/home/gui/apps/default.nix b/modules/home/gui/apps/default.nix index 2b2acd4..e2747ec 100644 --- a/modules/home/gui/apps/default.nix +++ b/modules/home/gui/apps/default.nix @@ -1,3 +1,3 @@ { ... }: { - imports = [ ./develop ./firefox ./images ./mpv ./pipewire ./vosk ./zathura ]; + imports = [ ./develop ./firefox ./images ./mpv ./pipewire ./zathura ]; } diff --git a/overlays/eww/default.nix b/overlays/eww/default.nix index f8da5a7..5f383db 100644 --- a/overlays/eww/default.nix +++ b/overlays/eww/default.nix @@ -1,18 +1,23 @@ { final, prev, ... }: -prev.eww.overrideAttrs (old: rec { +let old = prev.eww; +in final.rustPlatform.buildRustPackage rec { pname = "eww"; version = "ebe5f349d184e79edc33199d064d9ec5f1e4dd9b"; + src = prev.fetchFromGitHub { owner = "elkowar"; repo = "eww"; rev = "${version}"; hash = "sha256-WcAWIvIdGE0tcS7WJ6JlbRlUnKvpvut500NozUmJ6jY="; }; - buildInputs = old.buildInputs ++ [ final.libdbusmenu-gtk3 ]; - cargoDeps = old.cargoDeps.overrideAttrs (_: { - name = "${pname}-vendor.tar.gz"; - inherit src; - outputHash = "sha256-seq5aS+TCLAV3qnKu6fRYdSXC+w7vI4ae+A7dBdpw14="; - }); -}) + cargoHash = "sha256-8n21FN6uNj/y/PhCDzpB+1ZifIbpjn4d2YPy4vTcVBM="; + + nativeBuildInputs = old.nativeBuildInputs; + buildInputs = old.buildInputs ++ [ final.libdbusmenu-gtk3 ]; + + cargoBuildFlags = old.cargoBuildFlags; + cargoTestFlags = old.cargoTestFlags; + + RUSTC_BOOTSTRAP = 1; +}