giac: refactor

This commit is contained in:
Orivej Desh 2017-09-30 13:34:11 +00:00
parent 10a612120f
commit 0c14753a4a
2 changed files with 28 additions and 24 deletions

View File

@ -1,47 +1,51 @@
{stdenv, fetchurl, gmp, mpfr, pari, ntl, gsl, blas, { stdenv, fetchurl, texlive, bison, flex
readline, gettext, liblapackWithAtlas, bison, yacc, flex, , gmp, mpfr, pari, ntl, gsl, blas, mpfi, liblapackWithAtlas
mpfi, libpng, libao, gfortran, texlive, hevea, perl, , readline, gettext, libpng, libao, gfortran, perl
enableGui ? true, mesa ? null, xorg ? null, fltk ? null, , enableGUI ? false, mesa ? null, xorg ? null, fltk ? null
}: }:
assert enableGui -> mesa != null && xorg != null && fltk != null; assert enableGUI -> mesa != null && xorg != null && fltk != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "giac-${version}"; name = "${attr}-${version}";
attr = if enableGUI then "giac-with-xcas" else "giac";
version = "1.4.9"; version = "1.4.9";
src = fetchurl { src = fetchurl {
url = "https://www-fourier.ujf-grenoble.fr/~parisse/giac/${name}.tar.bz2"; url = "https://www-fourier.ujf-grenoble.fr/~parisse/giac/giac-${version}.tar.bz2";
sha256 = "1n7xxgpqrsq7cv5wgcmgag6jvxw5wijkf1yv1r5aizlf1rc7dhai"; sha256 = "1n7xxgpqrsq7cv5wgcmgag6jvxw5wijkf1yv1r5aizlf1rc7dhai";
}; };
postPatch = ''
patchPhase = '' for i in doc/*/Makefile*; do
for i in doc/*/Makefile* ; do
substituteInPlace "$i" --replace "/bin/cp" "cp"; substituteInPlace "$i" --replace "/bin/cp" "cp";
done; done;
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
texlive.combined.scheme-small hevea texlive.combined.scheme-small bison flex
]; ];
# perl is only needed for patchShebangs fixup.
buildInputs = [ buildInputs = [
gmp mpfr pari ntl gsl mpfi liblapackWithAtlas bison yacc flex readline gmp mpfr pari ntl gsl blas mpfi liblapackWithAtlas
gettext blas libpng gfortran perl readline gettext libpng libao gfortran perl
] ++ stdenv.lib.optionals enableGui [ ] ++ stdenv.lib.optionals enableGUI [
mesa fltk xorg.libX11 mesa fltk xorg.libX11
]; ];
outputs = [ "out" ];
enableParallelBuilding = true; enableParallelBuilding = true;
hardeningDisable = [ "format" "bindnow" "relro" ]; hardeningDisable = [ "format" "bindnow" "relro" ];
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" ] ++ stdenv.lib.optionals enableGui [ "--enable-ao"
"--enable-gui" "--with-x" ] ++ stdenv.lib.optionals enableGUI [
]; "--enable-gui" "--with-x"
];
postInstall = '' postInstall = ''
# example Makefiles contain the full path to some commands # example Makefiles contain the full path to some commands

View File

@ -9279,8 +9279,8 @@ with pkgs;
libminc = callPackage ../development/libraries/libminc { }; libminc = callPackage ../development/libraries/libminc { };
libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { };
libmkv = callPackage ../development/libraries/libmkv { }; libmkv = callPackage ../development/libraries/libmkv { };
libmms = callPackage ../development/libraries/libmms { }; libmms = callPackage ../development/libraries/libmms { };
@ -18435,8 +18435,8 @@ with pkgs;
gfan = callPackage ../applications/science/math/gfan {}; gfan = callPackage ../applications/science/math/gfan {};
xcas = callPackage ../applications/science/math/giac { }; giac = callPackage ../applications/science/math/giac { };
giac = xcas.override { enableGui = false;}; giac-with-xcas = giac.override { enableGUI = true; };
ginac = callPackage ../applications/science/math/ginac { }; ginac = callPackage ../applications/science/math/ginac { };