about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2020-07-16T23·26+0100
committertazjin <mail@tazj.in>2020-07-17T02·59+0000
commita2870d05a31c6b0faaf43c24b98ffce4a09503d3 (patch)
tree98897500a40c58f0f0d69b93087f267c1d88d972
parenta556913079c1936731243092fba5c5602655f5a0 (diff)
feat(3p/gtest): Bump version & override stdenv to libcxx r/1345
Change-Id: I19a34e80f51add5a7c6cde2650aae60c1919ad43
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1238
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
-rw-r--r--third_party/default.nix4
-rw-r--r--third_party/gtest/default.nix12
2 files changed, 14 insertions, 2 deletions
diff --git a/third_party/default.nix b/third_party/default.nix
index 7d2f6cdaecb4..f9b963f152ee 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 000000000000..6c2215fb7ad0
--- /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";
+  };
+})