public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #111487 from Ericson2314/llvm-outputs-and-cross-compile-tools

Browse Source 
llvmPackages: Clean up outputs
This commit is contained in:
John Ericson
2021-04-30 11:28:08 -04:00
committed by GitHub
parent a7dd5ca90f 7869d16545
commit 17305d2df0
210 changed files with 10414 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/datatable/default.nix
+1 -1
View File
@@ -39,7 +39,7 @@ buildPythonPackage rec {
checkInputs = [ docutils pytestCheckHook ];
LLVM = llvm;
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isystem ${libcxx}/include/c++/v1";
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1";
pytestFlagsArray = let
# ini file (not included in tarball) required to change python_files setting,
pkgs/development/python-modules/kiwisolver/1_1.nix
+1 -1
View File
@@ -14,7 +14,7 @@ buildPythonPackage rec {
sha256 = "53eaed412477c836e1b9522c19858a8557d6e595077830146182225613b11a75";
};
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
# Does not include tests
doCheck = false;
pkgs/development/python-modules/kiwisolver/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ buildPythonPackage rec {
sha256 = "950a199911a8d94683a6b10321f9345d5a3a8433ec58b217ace979e18f16e248";
};
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
nativeBuildInputs = [
cppy
pkgs/development/python-modules/numba/default.nix
+1 -1
View File
@@ -22,7 +22,7 @@ buildPythonPackage rec {
sha256 = "55c11d7edbba2ba715f2b56f5294cad55cfd87bff98e2627c3047c2d5cc52d16";
};
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
propagatedBuildInputs = [ numpy llvmlite setuptools ];
pythonImportsCheck = [ "numba" ];
pkgs/development/python-modules/pandas/2.nix
+1 -1
View File
@@ -59,7 +59,7 @@ buildPythonPackage rec {
# For OSX, we need to add a dependency on libcxx, which provides
# `complex.h` and other libraries that pandas depends on to build.
postPatch = lib.optionalString stdenv.isDarwin ''
cpp_sdk="${libcxx}/include/c++/v1";
cpp_sdk="${lib.getDev libcxx}/include/c++/v1";
echo "Adding $cpp_sdk to the setup.py common_include variable"
substituteInPlace setup.py \
--replace "['pandas/src/klib', 'pandas/src']" \
pkgs/development/python-modules/pandas/default.nix
+1 -1
View File
@@ -77,7 +77,7 @@ buildPythonPackage rec {
# For OSX, we need to add a dependency on libcxx, which provides
# `complex.h` and other libraries that pandas depends on to build.
postPatch = lib.optionalString stdenv.isDarwin ''
cpp_sdk="${libcxx}/include/c++/v1";
cpp_sdk="${lib.getDev libcxx}/include/c++/v1";
echo "Adding $cpp_sdk to the setup.py common_include variable"
substituteInPlace setup.py \
--replace "['pandas/src/klib', 'pandas/src']" \
pkgs/development/python-modules/py3exiv2/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ buildPythonPackage rec {
buildInputs = [ exiv2 boost ];
# work around python distutils compiling C++ with $CC (see issue #26709)
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
meta = with lib; {
homepage = "https://launchpad.net/py3exiv2";