diff --git a/third_party/default.nix b/third_party/default.nix
index 7d2f6cdae..f9b963f15 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -36,8 +36,8 @@ let
       age
       autoconf
       autoreconfHook
-      avrlibc
       avrdude
+      avrlibc
       awscli
       bashInteractive
       bat
@@ -207,7 +207,7 @@ in exposed.lib.fix(self: exposed // {
 
   # Packages to be overridden
   originals = {
-    inherit (nixpkgs) openldap go grpc notmuch rr;
+    inherit (nixpkgs) gtest openldap go grpc notmuch rr;
     inherit (stableNixpkgs) git;
     ffmpeg = nixpkgs.ffmpeg-full;
   };
diff --git a/third_party/gtest/default.nix b/third_party/gtest/default.nix
new file mode 100644
index 000000000..6c2215fb7
--- /dev/null
+++ b/third_party/gtest/default.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+(pkgs.originals.gtest.override {
+  stdenv = pkgs.llvmPackages.libcxxStdenv;
+}).overrideAttrs(_: {
+  src = pkgs.fetchFromGitHub {
+    owner = "google";
+    repo = "googletest";
+    rev = "a781fe29bcf73003559a3583167fe3d647518464";
+    sha256 = "0zny8kgbkslazzsnskygj3pkcj7l13xhgcwjyxswxymxq8m41kgy";
+  };
+})