feat(3p/gtest): Bump version & override stdenv to libcxx
Change-Id: I19a34e80f51add5a7c6cde2650aae60c1919ad43 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1238 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi>
This commit is contained in:
parent
a556913079
commit
a2870d05a3
2 changed files with 14 additions and 2 deletions
4
third_party/default.nix
vendored
4
third_party/default.nix
vendored
|
@ -36,8 +36,8 @@ let
|
||||||
age
|
age
|
||||||
autoconf
|
autoconf
|
||||||
autoreconfHook
|
autoreconfHook
|
||||||
avrlibc
|
|
||||||
avrdude
|
avrdude
|
||||||
|
avrlibc
|
||||||
awscli
|
awscli
|
||||||
bashInteractive
|
bashInteractive
|
||||||
bat
|
bat
|
||||||
|
@ -207,7 +207,7 @@ in exposed.lib.fix(self: exposed // {
|
||||||
|
|
||||||
# Packages to be overridden
|
# Packages to be overridden
|
||||||
originals = {
|
originals = {
|
||||||
inherit (nixpkgs) openldap go grpc notmuch rr;
|
inherit (nixpkgs) gtest openldap go grpc notmuch rr;
|
||||||
inherit (stableNixpkgs) git;
|
inherit (stableNixpkgs) git;
|
||||||
ffmpeg = nixpkgs.ffmpeg-full;
|
ffmpeg = nixpkgs.ffmpeg-full;
|
||||||
};
|
};
|
||||||
|
|
12
third_party/gtest/default.nix
vendored
Normal file
12
third_party/gtest/default.nix
vendored
Normal file
|
@ -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";
|
||||||
|
};
|
||||||
|
})
|
Loading…
Add table
Reference in a new issue