From 7a70ce59c2c3e7ed58789bede6affcb6ce641df0 Mon Sep 17 00:00:00 2001
From: Ju Liu <ju@noredink.com>
Date: Tue, 31 Aug 2021 11:36:48 +0100
Subject: [PATCH 1/2] Get debugir to track upstream again

---
 nix/debugir.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nix/debugir.nix b/nix/debugir.nix
index c0fc32bc21..dd0af8ee12 100644
--- a/nix/debugir.nix
+++ b/nix/debugir.nix
@@ -2,12 +2,11 @@
 
 pkgs.stdenv.mkDerivation {
   name = "debugir";
-  # we can go back to upstream when https://github.com/vaivaswatha/debugir/pull/4 gets merged
   src = pkgs.fetchFromGitHub {
-    owner = "Arkham";
+    owner = "vaivaswatha";
     repo = "debugir";
-    rev = "8d543e8796a1ab28ebf708e8e6883a574dd5e48c";
-    sha256 = "10sz3jwfkmqbp91d5aj9wd79k0cksl9qh4hirlivfyw8dcmbk384";
+    rev = "db871e6cee7f653e284b226e2567a2574635247c";
+    sha256 = "0rgh9gawf92mjya1plxlgi9azkwca3gq8qa5hri18k4b7sbjm6lx";
   };
   buildInputs = with pkgs; [ cmake libxml2 llvmPackages_12.llvm.dev ];
   buildPhase = ''

From 0033392563a61d2644f3b6cbdbef82c5864d656c Mon Sep 17 00:00:00 2001
From: Ju Liu <ju@noredink.com>
Date: Tue, 31 Aug 2021 11:39:15 +0100
Subject: [PATCH 2/2] Remove unused deps

---
 shell.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/shell.nix b/shell.nix
index 5ff0a03432..0cc46a5998 100644
--- a/shell.nix
+++ b/shell.nix
@@ -50,8 +50,6 @@ let
     zig
 
     # lib deps
-    llvmPkgs.libcxx
-    llvmPkgs.libcxxabi
     libffi
     libxml2
     ncurses