Merge pull request #20191 from periklis/darwin_support_rtags

rtags: fix darwin build

Changed files
+12 -5
pkgs
development
tools
rtags
top-level
+9 -4
pkgs/development/tools/rtags/default.nix
···
-
{ stdenv, fetchgit, cmake, llvmPackages, openssl, writeScript, bash, emacs }:
stdenv.mkDerivation rec {
name = "rtags-${version}";
version = "2.3";
-
buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ];
preConfigure = ''
-
export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags)" \
-
LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib"
'';
src = fetchgit {
···
+
{ 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 ]
+
++ 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" \
+
+
'' + lib.optionalString stdenv.isDarwin ''
+
export CXXFLAGS="-isysroot ${apple_sdk.sdk}/" \
+
MACOSX_DEPLOYMENT_TARGET="10.9"
'';
src = fetchgit {
+3 -1
pkgs/top-level/all-packages.nix
···
rgbds = callPackage ../development/compilers/rgbds { };
-
rtags = callPackage ../development/tools/rtags/default.nix {};
rust = rustStable;
rustStable = callPackage ../development/compilers/rust {};
···
rgbds = callPackage ../development/compilers/rgbds { };
+
rtags = callPackage ../development/tools/rtags/default.nix {
+
inherit (darwin) apple_sdk;
+
};
rust = rustStable;
rustStable = callPackage ../development/compilers/rust {};