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

giac: add missing optional dependencies

Browse Source
This commit is contained in:
Symphorien Gibol 2018-12-08 21:10:24 +01:00
parent e7801461e0
commit 8b4f885264
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/science/math/giac/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, texlive, bison, flex, liblapack { stdenv, fetchurl, fetchpatch, texlive, bison, flex, liblapack
, gmp, mpfr, pari, ntl, gsl, blas, mpfi , gmp, mpfr, pari, ntl, gsl, blas, mpfi, ecm, glpk
, readline, gettext, libpng, libao, gfortran, perl , readline, gettext, libpng, libao, gfortran, perl
, enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null , enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null
}: }:
@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
# perl is only needed for patchShebangs fixup. # perl is only needed for patchShebangs fixup.
buildInputs = [ buildInputs = [
gmp mpfr pari ntl gsl blas mpfi gmp mpfr pari ntl gsl blas mpfi glpk
readline gettext libpng libao perl readline gettext libpng libao perl ecm
# gfortran.cc default output contains static libraries compiled without -fPIC # gfortran.cc default output contains static libraries compiled without -fPIC
# we want libgfortran.so.3 instead # we want libgfortran.so.3 instead
(stdenv.lib.getLib gfortran.cc) (stdenv.lib.getLib gfortran.cc)
@ -47,6 +47,13 @@ stdenv.mkDerivation rec {
libGLU_combined fltk xorg.libX11 libGLU_combined fltk xorg.libX11
]; ];
/* fixes:
configure:16211: checking for main in -lntl
configure:16230: g++ -o conftest -g -O2 conftest.cpp -lntl -llapack -lblas -lgfortran -ldl -lpng16 -lm -lmpfi -lmpfr -lgmp >&5
/nix/store/y9c1v4x7y39j2rfbg17agjwqdzxpsn18-ntl-11.3.2/lib/libntl.so: undefined reference to `pthread_key_create'
*/
NIX_CFLAGS_LINK="-lpthread";
# xcas Phys and Turtle menus are broken with split outputs # xcas Phys and Turtle menus are broken with split outputs
# and interactive use is likely to need docs # and interactive use is likely to need docs
outputs = [ "out" ] ++ stdenv.lib.optional (!enableGUI) "doc"; outputs = [ "out" ] ++ stdenv.lib.optional (!enableGUI) "doc";
@ -66,7 +73,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--enable-gc" "--enable-png" "--enable-gsl" "--enable-lapack" "--enable-gc" "--enable-png" "--enable-gsl" "--enable-lapack"
"--enable-pari" "--enable-ntl" "--enable-gmpxx" # "--enable-cocoa" "--enable-pari" "--enable-ntl" "--enable-gmpxx" # "--enable-cocoa"
"--enable-ao" "--enable-ao" "--enable-ecm" "--enable-glpk"
] ++ stdenv.lib.optionals enableGUI [ ] ++ stdenv.lib.optionals enableGUI [
"--enable-gui" "--with-x" "--enable-gui" "--with-x"
]; ];