diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2018-09-07 21:55:41 +0200 |
|---|---|---|
| committer | Timo Kaufmann <timokau@zoho.com> | 2018-09-07 21:55:41 +0200 |
| commit | db784d883c4fbc276a1c639c8ff675a5fe805cac (patch) | |
| tree | e83eecfdd5f2a270729659734ba5203c4db9933e /pkgs/applications/science/math/sage/sage-env.nix | |
| parent | b11cfc26224f9fc6ab4bdd83b90e766fe3deb1b9 (diff) | |
| download | nixlib-db784d883c4fbc276a1c639c8ff675a5fe805cac.tar nixlib-db784d883c4fbc276a1c639c8ff675a5fe805cac.tar.gz nixlib-db784d883c4fbc276a1c639c8ff675a5fe805cac.tar.bz2 nixlib-db784d883c4fbc276a1c639c8ff675a5fe805cac.tar.lz nixlib-db784d883c4fbc276a1c639c8ff675a5fe805cac.tar.xz nixlib-db784d883c4fbc276a1c639c8ff675a5fe805cac.tar.zst nixlib-db784d883c4fbc276a1c639c8ff675a5fe805cac.zip | |
sage: re-add pkg-config aliases
Those were removed because they were added to openblas itself. There was an error with that however and it will take some time until the fix makes its way through staging. For the time being, reverting this part of 26d5d030fe498b64a307af35ff96ff215ccd967a will fix the sage build. This commit should be reverted once 408eacbc896ecc6d0e25238963ecbd412d78ce3c is in master.
Diffstat (limited to 'pkgs/applications/science/math/sage/sage-env.nix')
| -rw-r--r-- | pkgs/applications/science/math/sage/sage-env.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index 74c2e0aa0360..317eb6e16c49 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -37,7 +37,7 @@ , lcalc , rubiks , flintqs -, openblasCompat +, openblas-cblas-pc , flint , gmp , mpfr @@ -98,9 +98,9 @@ writeTextFile rec { export PKG_CONFIG_PATH='${lib.concatStringsSep ":" (map (pkg: "${pkg}/lib/pkgconfig") [ # This is only needed in the src/sage/misc/cython.py test and I'm not sure if there's really a use-case # for it outside of the tests. However since singular and openblas are runtime dependencies anyways - # it doesn't really hurt to include. + # and openblas-cblas-pc is tiny, it doesn't really hurt to include. singular - openblasCompat + openblas-cblas-pc ]) }' export SAGE_ROOT='${sage-src}' |