about summary refs log tree commit diff
path: root/third_party
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-08T17·07+0100
committerVincent Ambo <tazjin@google.com>2020-05-08T17·07+0100
commit12387550e347658dc353c7ad566a1d37a3c89746 (patch)
tree6691eb1d599d1bbef4bd844690da34241f97ab19 /third_party
parent8486d2ace507c49dcf31836b82e780519d71c924 (diff)
feat(third_party): Add newer version of Abseil r/705
Diffstat (limited to 'third_party')
-rw-r--r--third_party/abseil-cpp/default.nix12
-rw-r--r--third_party/default.nix4
2 files changed, 14 insertions, 2 deletions
diff --git a/third_party/abseil-cpp/default.nix b/third_party/abseil-cpp/default.nix
new file mode 100644
index 000000000000..e9f35d64bb31
--- /dev/null
+++ b/third_party/abseil-cpp/default.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+(pkgs.originals.abseil-cpp.overrideAttrs(_: {
+  version = "20200220-0232c87f";
+
+  src = pkgs.fetchFromGitHub {
+    owner = "abseil";
+    repo = "abseil-cpp";
+    rev = "0232c87f21c26718aa3eb2d86678070f3b498a4e";
+    sha256 = "1shay44sg0glz1f2jbx7dyvrrqmnx07q7azwraigyj61f7b9ccyx";
+  };
+}))
diff --git a/third_party/default.nix b/third_party/default.nix
index f1cdff406201..79fcdd9683fa 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -33,6 +33,7 @@ let
       cairo
       cargo
       cgit
+      clangStdenv
       clang_9
       cmake
       coreutils
@@ -81,7 +82,6 @@ let
       openssh
       openssl
       overrideCC
-      overrideCCC
       pandoc
       parallel
       pkgconfig
@@ -126,7 +126,7 @@ in exposed // {
 
   # Packages to be overridden
   originals = {
-    inherit (nixpkgs) git notmuch;
+    inherit (nixpkgs) abseil-cpp git notmuch;
     ffmpeg = nixpkgs.ffmpeg-full;
   };