MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #20191 from periklis/darwin_support_rtags

Browse source 
rtags: fix darwin build
This commit is contained in:
Daiderd Jordan 2016-11-07 21:08:21 +01:00 committed by GitHub
commit dcb2179a1f
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/tools/rtags/default.nix
View file

@ -1,14 +1,19 @@
{ stdenv, fetchgit, cmake, llvmPackages, openssl, writeScript, bash, emacs }:
{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, writeScript, apple_sdk, bash, emacs }:
stdenv.mkDerivation rec {
name = "rtags-${version}";
version = "2.3";
buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ];
buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ]
++ lib.optional stdenv.isDarwin apple_sdk.sdk;
preConfigure = ''
export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) " \
LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib"
LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" \
'' + lib.optionalString stdenv.isDarwin ''
export CXXFLAGS="-isysroot ${apple_sdk.sdk}/" \
MACOSX_DEPLOYMENT_TARGET="10.9"
'';
src = fetchgit {

4
pkgs/top-level/all-packages.nix
View file

@ -5137,7 +5137,9 @@ in
rgbds = callPackage ../development/compilers/rgbds { };
rtags = callPackage ../development/tools/rtags/default.nix {};
rtags = callPackage ../development/tools/rtags/default.nix {
inherit (darwin) apple_sdk;
};
rust = rustStable;
rustStable = callPackage ../development/compilers/rust {};