From 66cd5f891b8519385f6c7feac3343e3f9beeacf0 Mon Sep 17 00:00:00 2001
From: Devin Droddy <devin.droddy@gmail.com>
Date: Thu, 19 Dec 2024 12:47:03 -0500
Subject: [PATCH 1/2] ashell: init at 0.3.1

---
 pkgs/by-name/as/ashell/package.nix | 52 ++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 pkgs/by-name/as/ashell/package.nix

diff --git a/pkgs/by-name/as/ashell/package.nix b/pkgs/by-name/as/ashell/package.nix
new file mode 100644
index 000000000000..938cec3f7612
--- /dev/null
+++ b/pkgs/by-name/as/ashell/package.nix
@@ -0,0 +1,52 @@
+{
+  fetchFromGitHub,
+  lib,
+  rustPlatform,
+  autoPatchelfHook,
+  pkg-config,
+  libxkbcommon,
+  libGL,
+  pipewire,
+  libpulseaudio,
+  wayland,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "ashell";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "MalpenZibo";
+    repo = "ashell";
+    tag = version;
+    hash = "sha256-QZe67kjyHzJkZFoAOQhntYsHvvuM6L1y2wtGYTwizd4=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-iFg+xcdb0cMrrxmGr6VvbuD00eVknIlZeB7B7A1l4EI=";
+
+  nativeBuildInputs = [
+    pkg-config
+    autoPatchelfHook
+  ];
+
+  runtimeDependencies = [
+    wayland
+    libGL
+  ];
+
+  buildInputs = [
+    libpulseaudio
+    rustPlatform.bindgenHook
+    libxkbcommon
+    pipewire
+  ] ++ runtimeDependencies;
+
+  meta = {
+    description = "Ready to go Wayland status bar for Hyprland";
+    homepage = "https://github.com/MalpenZibo/ashell";
+    license = lib.licenses.mit;
+    mainProgram = "ashell";
+    maintainers = with lib.maintainers; [ justdeeevin ];
+    platforms = lib.platforms.linux;
+  };
+}

From c6f2f8b736c32514ea8f0665a9b3555ea35a9045 Mon Sep 17 00:00:00 2001
From: Devin Droddy <devin.droddy@gmail.com>
Date: Thu, 23 Jan 2025 13:59:59 -0500
Subject: [PATCH 2/2] ashell: 0.3.1 -> 0.4.0

---
 pkgs/by-name/as/ashell/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/as/ashell/package.nix b/pkgs/by-name/as/ashell/package.nix
index 938cec3f7612..f89bd96f66c4 100644
--- a/pkgs/by-name/as/ashell/package.nix
+++ b/pkgs/by-name/as/ashell/package.nix
@@ -12,21 +12,22 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "ashell";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "MalpenZibo";
     repo = "ashell";
     tag = version;
-    hash = "sha256-QZe67kjyHzJkZFoAOQhntYsHvvuM6L1y2wtGYTwizd4=";
+    hash = "sha256-a0yvmAq/4TDe+W1FLeLPSLppX81G6fdAOhzDmDJg3II=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-iFg+xcdb0cMrrxmGr6VvbuD00eVknIlZeB7B7A1l4EI=";
+  cargoHash = "sha256-Vh/+4iApi+03ZmMIDSXc9Mn408v3wC+WlNJsXNcva+Q=";
 
   nativeBuildInputs = [
     pkg-config
     autoPatchelfHook
+    rustPlatform.bindgenHook
   ];
 
   runtimeDependencies = [
@@ -36,7 +37,6 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     libpulseaudio
-    rustPlatform.bindgenHook
     libxkbcommon
     pipewire
   ] ++ runtimeDependencies;