summary refs log tree commit diff
path: root/pkgs/development/python-modules/pandas
diff options
context:
space:
mode:
authorAndrew Childs <lorne@cons.org.nz>2020-10-15 17:23:57 +0900
committerJohn Ericson <John.Ericson@Obsidian.Systems>2021-04-30 05:41:00 +0000
commit7869d1654517c028aa76fc1dedc9b5ac301a867a (patch)
tree28385e3d35074ace1c036e5bee5b7aa3d684059d /pkgs/development/python-modules/pandas
parent17a8c9c4bfd9042b92b1d07d638a3dc1157b11d4 (diff)
downloadnixpkgs-7869d1654517c028aa76fc1dedc9b5ac301a867a.tar
nixpkgs-7869d1654517c028aa76fc1dedc9b5ac301a867a.tar.gz
nixpkgs-7869d1654517c028aa76fc1dedc9b5ac301a867a.tar.bz2
nixpkgs-7869d1654517c028aa76fc1dedc9b5ac301a867a.tar.lz
nixpkgs-7869d1654517c028aa76fc1dedc9b5ac301a867a.tar.xz
nixpkgs-7869d1654517c028aa76fc1dedc9b5ac301a867a.tar.zst
nixpkgs-7869d1654517c028aa76fc1dedc9b5ac301a867a.zip
llvmPackages: Multuple outputs for everythting
Also begin to start work on cross compilation, though that will have to
be finished later.

The patches are based on the first version of
https://reviews.llvm.org/D99484. It's very annoying to do the
back-porting but the review has uncovered nothing super major so I'm
fine sticking with what I've got.

Beyond making the outputs work, I also strove to re-sync the packages,
as they have been drifting pointlessly apart for some time.

----

Other misc notes, highly incomplete

- lvm-config-native and llvm-config are put in `dev` because they are
  tools just for build time.

- Clang no longer has an lld dep. That was introduced in
  db29857eb391ed002046090851a44c452b80bdbd, but if clang needs help
  finding lld when it is used we should just pass it flags / put in the
  resource dir. Providing it at build time increases critical path
  length for no good reason.

----

A note on `nativeCC`:

`stdenv` takes tools from the previous stage, so:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.stdenv.cc`: `(?0, ?1, x)`

while:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.targetPackages`: `(x, x, ?2)`
3. `pkgsBuildBuild.targetPackages.stdenv.cc`: `(?1, x, x)`
Diffstat (limited to 'pkgs/development/python-modules/pandas')
-rw-r--r--pkgs/development/python-modules/pandas/2.nix2
-rw-r--r--pkgs/development/python-modules/pandas/default.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/pandas/2.nix b/pkgs/development/python-modules/pandas/2.nix
index 936a3db296e..8af4094b0cf 100644
--- a/pkgs/development/python-modules/pandas/2.nix
+++ b/pkgs/development/python-modules/pandas/2.nix
@@ -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']" \
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 7fd551e192c..f3505e3c9a6 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -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']" \