about summary refs log tree commit diff
path: root/third_party
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-27T00·25+0100
committerVincent Ambo <tazjin@google.com>2020-05-27T00·25+0100
commit7dc094173b641c78a449395cc6f28a5e52b6fe64 (patch)
treea75e090a28ed3750774d094b25028dedff8fa71e /third_party
parent2e32ceb5234bee1f541a72abc41bfc6dcf60b7c4 (diff)
chore(3p): Remove glog override r/862
This library is being vendored, hence the override doesn't matter
anymore.
Diffstat (limited to 'third_party')
-rw-r--r--third_party/default.nix2
-rw-r--r--third_party/glog/default.nix15
2 files changed, 1 insertions, 16 deletions
diff --git a/third_party/default.nix b/third_party/default.nix
index 38317f7005..e8f878a896 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -162,7 +162,7 @@ in exposed // {
 
   # Packages to be overridden
   originals = {
-    inherit (nixpkgs) abseil-cpp glog notmuch;
+    inherit (nixpkgs) abseil-cpp notmuch;
     inherit (stableNixpkgs) git;
     ffmpeg = nixpkgs.ffmpeg-full;
   };
diff --git a/third_party/glog/default.nix b/third_party/glog/default.nix
deleted file mode 100644
index c51724e27b..0000000000
--- a/third_party/glog/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ pkgs, ... }:
-
-pkgs.originals.glog.overrideAttrs(old: {
-  version = "master-20200518";
-
-  # packaged version has a patch that is now in master.
-  patches = [];
-
-  src = pkgs.fetchFromGitHub {
-    owner = "google";
-    repo = "glog";
-    rev = "0a2e5931bd5ff22fd3bf8999eb8ce776f159cda6";
-    sha256 = "08yih0hc63j02p0ms4ydbgf2c13v2c7knjzp3qdin0v3sng896wg";
-  };
-})