diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-18T01·39+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-18T01·39+0100 |
| commit | ce99ba42df493bb521f47789fb8902d7693c5b9c (patch) | |
| tree | f3aa98e4f9e897423d098e8ae7cd043865307d8f | |
| parent | 6dc6c29fa4a4ddd3bb72f8415fac5936d719bd44 (diff) | |
feat(3p/glog): Update glog version r/755
| -rw-r--r-- | third_party/default.nix | 3 | ||||
| -rw-r--r-- | third_party/glog/default.nix | 15 |
2 files changed, 16 insertions, 2 deletions
diff --git a/third_party/default.nix b/third_party/default.nix index 97a2dae86e76..16d99cadf3b1 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -54,7 +54,6 @@ let freetype gettext glibc - glog gnutar go google-cloud-sdk @@ -151,7 +150,7 @@ in exposed // { # Packages to be overridden originals = { - inherit (nixpkgs) abseil-cpp git notmuch; + inherit (nixpkgs) abseil-cpp git glog notmuch; ffmpeg = nixpkgs.ffmpeg-full; }; diff --git a/third_party/glog/default.nix b/third_party/glog/default.nix new file mode 100644 index 000000000000..c51724e27bec --- /dev/null +++ b/third_party/glog/default.nix @@ -0,0 +1,15 @@ +{ 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"; + }; +}) |