From 86a35d963d7b6108dec44411c8ebd5aadbb148ac Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 27 May 2020 21:52:44 +0100 Subject: refactor(3p/abseil_cpp): Inline Nix derivation --- third_party/abseil_cpp/default.nix | 16 +++++++++++++--- 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 ddc5c1c7b7..ec2e996d6a 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 e8f878a896..f4c7a67ce4 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; }; -- cgit 1.4.1