mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(3p/gtest): Bump version & override stdenv to libcxx

Browse source 
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:
Vincent Ambo 2020-07-17 00:26:48 +01:00 committed by tazjin
parent a556913079
commit a2870d05a3
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
third_party/default.nix vendored
View file

@ -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;
};

12
third_party/gtest/default.nix vendored Normal file
View 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";
};
})