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

giac-with-xcas: fix build

Browse Source 
remove libGLU_combined package and replace with libGL and libGLU
This commit is contained in:
Jonathan Ringer 2019-11-24 11:12:55 -08:00 committed by Jon
parent 86b6ee9825
commit 9dc8e77e4e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, texlive, bison, flex, liblapack { stdenv, lib, fetchurl, fetchpatch, texlive, bison, flex, liblapack
, gmp, mpfr, pari, ntl, gsl, blas, mpfi, ecm, glpk, nauty , gmp, mpfr, pari, ntl, gsl, blas, mpfi, ecm, glpk, nauty
, readline, gettext, libpng, libao, gfortran, perl , readline, gettext, libpng, libao, gfortran, perl
, enableGUI ? false, libGL ? null, libGLU ? null, xorg ? null, fltk ? null , enableGUI ? false, libGL ? null, libGLU ? null, xorg ? null, fltk ? null
@ -7,8 +7,7 @@
assert enableGUI -> libGLU != null && libGL != null && xorg != null && fltk != null; assert enableGUI -> libGLU != null && libGL != null && xorg != null && fltk != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${attr}-${version}"; pname = "giac${lib.optionalString enableGUI "-with-xcas"}";
attr = if enableGUI then "giac-with-xcas" else "giac";
version = "1.5.0-21"; # TODO try to remove preCheck phase on upgrade version = "1.5.0-21"; # TODO try to remove preCheck phase on upgrade
src = fetchurl { src = fetchurl {
@ -104,7 +103,7 @@ stdenv.mkDerivation rec {
description = "A free computer algebra system (CAS)"; description = "A free computer algebra system (CAS)";
homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"; homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.unix; platforms = platforms.linux ++ (optionals (!enableGUI) platforms.darwin);
maintainers = [ maintainers.symphorien ]; maintainers = [ maintainers.symphorien ];
}; };
} }