sage: fix pkgconfig errors in tests
python.pkgs.pkgconfig raises an exception on missing packages since version 1.5.0. Previously those errors were just silently ignored. That worked fine, since the packages are only missing at runtime (when they are not really needed) but present at buildtime. Since this fails the tests now, we just add the packages to PKG_CONFIG_PATH at runtime. This does not add additional runtime dependencies. Still, it would be nicer if the sage testssuite would not test the buildsystem at runtime in the first place. The breakage was originally caused by the pkgconfig update in 1efa71616fadd5c7f852173445b2db824534b99b.
This commit is contained in:
parent
da7ec1c139
commit
f64885b9ca
@ -18,6 +18,12 @@
|
|||||||
, ecl
|
, ecl
|
||||||
, maxima-ecl
|
, maxima-ecl
|
||||||
, singular
|
, singular
|
||||||
|
, fflas-ffpack
|
||||||
|
, givaro
|
||||||
|
, gd
|
||||||
|
, libpng
|
||||||
|
, linbox
|
||||||
|
, m4ri
|
||||||
, giac
|
, giac
|
||||||
, palp
|
, palp
|
||||||
, rWrapper
|
, rWrapper
|
||||||
@ -101,14 +107,21 @@ writeTextFile rec {
|
|||||||
name = "sage-env";
|
name = "sage-env";
|
||||||
destination = "/${name}";
|
destination = "/${name}";
|
||||||
text = ''
|
text = ''
|
||||||
export PKG_CONFIG_PATH='${lib.concatStringsSep ":" (map (pkg: "${pkg}/lib/pkgconfig") [
|
export PKG_CONFIG_PATH='${lib.makeSearchPathOutput "dev" "lib/pkgconfig" [
|
||||||
# This is only needed in the src/sage/misc/cython.py test and I'm not
|
# This should only be needed during build. However, since the doctests
|
||||||
# sure if there's really a usecase for it outside of the tests. However
|
# also test the cython build (for example in src/sage/misc/cython.py),
|
||||||
# since singular and openblas are runtime dependencies anyways, it doesn't
|
# it is also needed for the testsuite to pass. We could fix the
|
||||||
# really hurt to include.
|
# testsuite instead, but since all the packages are also runtime
|
||||||
|
# dependencies it doesn't really hurt to include them here.
|
||||||
singular
|
singular
|
||||||
openblasCompat
|
openblasCompat
|
||||||
])
|
fflas-ffpack givaro
|
||||||
|
gd
|
||||||
|
libpng zlib
|
||||||
|
gsl
|
||||||
|
linbox
|
||||||
|
m4ri
|
||||||
|
]
|
||||||
}'
|
}'
|
||||||
export SAGE_ROOT='${sagelib.src}'
|
export SAGE_ROOT='${sagelib.src}'
|
||||||
export SAGE_LOCAL='@sage-local@'
|
export SAGE_LOCAL='@sage-local@'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user