From 0c5de365e698165d234591033fa45380cd4b2760 Mon Sep 17 00:00:00 2001
From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com>
Date: Sun, 19 Nov 2023 17:44:37 +0100
Subject: [PATCH] Fix cargo-mommys interaction with $CARGO

---
 custom-pkgs/cargo-mommy.nix | 7 +++----
 home-manager/desktop.nix    | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/custom-pkgs/cargo-mommy.nix b/custom-pkgs/cargo-mommy.nix
index d69ce17..8873dc6 100644
--- a/custom-pkgs/cargo-mommy.nix
+++ b/custom-pkgs/cargo-mommy.nix
@@ -8,12 +8,11 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "Gankra";
     repo = "cargo-mommy";
-    rev = "6feb98f10ede68c82d99f70aa79cb3a53530dc88";
-    hash = "sha256-DuPDF594KgItrDzjFxP2xHNuzziZCmq5bCrhCh71Y1U=";
-
+    rev = "0d96506db241003166e32deb22ad0ab0fc52c16c";
+    hash = "sha256-SIL7ExSRVBXr7Z+ye+rjjUpK6WS/fytvfhj3WPPdenc=";
   };
 
-  cargoSha256 = "sha256-YkKHlLv6w3PHjv9Z94QUUO41v0W1FJ7zAUoTsKfaQG0=";
+  cargoSha256 = "sha256-hdWYvWNOko6wlffv2Vb3xTYfh9mQgLlON8EVKVkWUV0=";
 
   meta = with lib; {
     description = "Cargo wrapper that encourages you after running commands";
diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix
index 3d6823f..ec817ea 100644
--- a/home-manager/desktop.nix
+++ b/home-manager/desktop.nix
@@ -54,7 +54,7 @@ in
 
     };
     shellAliases = {
-      x = "CARGO=${lib.getExe customPkgs.x} ${lib.getExe customPkgs.cargo-mommy}";
+      x = "CARGO_MOMMYS_ACTUAL=${lib.getExe customPkgs.x} ${lib.getExe customPkgs.cargo-mommy}";
     };
   };