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

Merge pull request #38810 from timokau/giac-improvements

Browse Source 
giac: enable checks, separate outputs
This commit is contained in:
Matthew Justin Bauer 2018-04-19 12:03:53 -05:00 committed by GitHub
commit 1bb28f26e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, texlive, bison, flex { stdenv, fetchurl, fetchpatch, texlive, bison, flex
, gmp, mpfr, pari, ntl, gsl, blas, mpfi, liblapackWithAtlas , gmp, mpfr, pari, ntl, gsl, blas, mpfi, liblapackWithAtlas
, 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
@ -16,6 +16,15 @@ stdenv.mkDerivation rec {
sha256 = "0dv5p5y6gkrsmz3xa7fw87rjyabwdwk09mqb09kb7gai9n9dgayk"; sha256 = "0dv5p5y6gkrsmz3xa7fw87rjyabwdwk09mqb09kb7gai9n9dgayk";
}; };
patches = stdenv.lib.optionals (!enableGUI) [
# when enableGui is false, giac is compiled without fltk. That means some
# outputs differ in the make check. Patch around this:
(fetchpatch {
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26";
sha256 = "0xkmfc028vg5w6va04gp2x2iv31n8v4shd6vbyvk4blzgfmpj2cw";
})
];
postPatch = '' postPatch = ''
for i in doc/*/Makefile*; do for i in doc/*/Makefile*; do
substituteInPlace "$i" --replace "/bin/cp" "cp"; substituteInPlace "$i" --replace "/bin/cp" "cp";
@ -37,10 +46,11 @@ stdenv.mkDerivation rec {
libGLU_combined fltk xorg.libX11 libGLU_combined fltk xorg.libX11
]; ];
outputs = [ "out" ]; outputs = [ "out" "doc" ];
doCheck = true;
enableParallelBuilding = true; enableParallelBuilding = true;
hardeningDisable = [ "format" "bindnow" "relro" ];
configureFlags = [ configureFlags = [
"--enable-gc" "--enable-png" "--enable-gsl" "--enable-lapack" "--enable-gc" "--enable-png" "--enable-gsl" "--enable-lapack"
@ -57,6 +67,13 @@ stdenv.mkDerivation rec {
for file in $(find $out -name Makefile) ; do for file in $(find $out -name Makefile) ; do
sed -i "s@/nix/store/[^/]*/bin/@@" "$file" ; sed -i "s@/nix/store/[^/]*/bin/@@" "$file" ;
done; done;
# reference cycle
rm "$out/share/giac/doc/el/"{casinter,tutoriel}/Makefile
mkdir -p "$doc/share/giac"
mv "$out/share/giac/doc" "$doc/share/giac"
mv "$out/share/giac/examples" "$doc/share/giac"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {