diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-06-07T13·56+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-06-07T13·56+0100 |
| commit | 4fb8788c01f2e9975d2ff1c3ac389ee8fe844a2f (patch) | |
| tree | 2e9c389a9e3234628163a7b440c05d51bc0577ee | |
| parent | 94846503c59b4155cc98280ef1c5cbcf69696ff9 (diff) | |
feat(3p/protobuf): Check in derivation for proto 3.12 with libcxx r/883
| -rw-r--r-- | third_party/default.nix | 3 | ||||
| -rw-r--r-- | third_party/protobuf/default.nix | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/third_party/default.nix b/third_party/default.nix index c568e08d9b..2286af193d 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -25,7 +25,7 @@ let stableNixpkgs = import stableNixpkgsSrc {}; exposed = { - # Inherit the packages from nixos-usntable that should be available inside + # Inherit the packages from nixos-unstable that should be available inside # of the repo. They become available under `pkgs.third_party.<name>` inherit (nixpkgs) age @@ -114,6 +114,7 @@ let texlive thttpd tree + which writeShellScript writeShellScriptBin writeText diff --git a/third_party/protobuf/default.nix b/third_party/protobuf/default.nix new file mode 100644 index 0000000000..84ac44c26b --- /dev/null +++ b/third_party/protobuf/default.nix @@ -0,0 +1,12 @@ +# Pin protobuf to version 3.12, with LLVM. +{ pkgs, ... }: + +pkgs.callPackage "${pkgs.nixpkgsSrc}/pkgs/development/libraries/protobuf/generic-v3.nix" { + version = "3.12.2"; + sha256 = "1lp368aa206vpic9fmax4k6llnmf28plfvkkm4vqhgphmjqykvl2"; + stdenv = pkgs.llvmPackages.libcxxStdenv; + buildPackages = { + inherit (pkgs) which; + stdenv = pkgs.llvmPackages.libcxxStdenv; + }; +} |