Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f60459a023a7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bf444fd4426d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 5, 2019

  1. Add Darwin support for ccls

    Väinö Järvelä committed Mar 5, 2019
    Copy the full SHA
    41a6752 View commit details

  2. Merge pull request #56673 from Kaali/darwin-ccls 

    Add Darwin support for ccls
    @Mic92
    Mic92 authored Mar 5, 2019
    Copy the full SHA
    bf444fd View commit details
Showing with 7 additions and 2 deletions.
  1. +6 −2 pkgs/development/tools/misc/ccls/default.nix
  2. +1 −0 pkgs/top-level/all-packages.nix
8 changes: 6 additions & 2 deletions pkgs/development/tools/misc/ccls/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -8579,6 +8579,7 @@ in

ccls = callPackage ../development/tools/misc/ccls {
llvmPackages = llvmPackages_latest;
stdenv = llvmPackages_latest.stdenv;
};

credstash = with python3Packages; toPythonApplication credstash;