From 41a675258f351d33f4f92be782522ea071174b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A4in=C3=B6=20J=C3=A4rvel=C3=A4?= Date: Sat, 2 Mar 2019 10:42:54 +0200 Subject: [PATCH] Add Darwin support for ccls --- pkgs/development/tools/misc/ccls/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix index c8ab6b0fd96..7f0bc9ff4ff 100644 --- a/pkgs/development/tools/misc/ccls/default.nix +++ b/pkgs/development/tools/misc/ccls/default.nix @@ -15,7 +15,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = with llvmPackages; [ clang-unwrapped llvm rapidjson ]; - cmakeFlags = [ "-DSYSTEM_CLANG=ON" ]; + cmakeFlags = [ + "-DSYSTEM_CLANG=ON" + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12" + "-DCMAKE_CXX_FLAGS=-fvisibility=hidden" + ]; shell = runtimeShell; postFixup = '' @@ -37,7 +41,7 @@ stdenv.mkDerivation rec { description = "A c/c++ language server powered by clang"; homepage = https://github.com/MaskRay/ccls; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.mic92 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83498a3b02b..8879db78cd8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8579,6 +8579,7 @@ in ccls = callPackage ../development/tools/misc/ccls { llvmPackages = llvmPackages_latest; + stdenv = llvmPackages_latest.stdenv; }; credstash = with python3Packages; toPythonApplication credstash;