diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-27T20·52+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-27T20·52+0100 |
commit | 86a35d963d7b6108dec44411c8ebd5aadbb148ac (patch) | |
tree | 23ba27af32d122bb9f8243fbc93b3cba1ff2ac38 | |
parent | 6941048b7e55ec85ec257c4f597e7f0d54e1584d (diff) |
refactor(3p/abseil_cpp): Inline Nix derivation r/864
-rw-r--r-- | third_party/abseil_cpp/default.nix | 16 | ||||
-rw-r--r-- | third_party/default.nix | 2 |
2 files changed, 14 insertions, 4 deletions
diff --git a/third_party/abseil_cpp/default.nix b/third_party/abseil_cpp/default.nix index ddc5c1c7b798..ec2e996d6a45 100644 --- a/third_party/abseil_cpp/default.nix +++ b/third_party/abseil_cpp/default.nix @@ -1,6 +1,16 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: -pkgs.originals.abseil-cpp.overrideAttrs(_: { +let inherit (pkgs) cmake llvmPackages; +in llvmPackages.libcxxStdenv.mkDerivation rec { + pname = "abseil-cpp"; version = "20200519-768eb2ca"; src = ./.; -}) + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "An open-source collection of C++ code designed to augment the C++ standard library"; + homepage = https://abseil.io/; + license = licenses.asl20; + maintainers = [ maintainers.andersk ]; + }; +} diff --git a/third_party/default.nix b/third_party/default.nix index e8f878a896cb..f4c7a67ce4cd 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 notmuch; + inherit (nixpkgs) notmuch; inherit (stableNixpkgs) git; ffmpeg = nixpkgs.ffmpeg-full; }; |