From 9dc8e77e4e54416551eb3d71df121d14b5ca708a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 24 Nov 2019 11:12:55 -0800 Subject: [PATCH] giac-with-xcas: fix build remove libGLU_combined package and replace with libGL and libGLU --- pkgs/applications/science/math/giac/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index 862761fe6fb5..b3777528ecda 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -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 , readline, gettext, libpng, libao, gfortran, perl , enableGUI ? false, libGL ? null, libGLU ? null, xorg ? null, fltk ? null @@ -7,8 +7,7 @@ assert enableGUI -> libGLU != null && libGL != null && xorg != null && fltk != null; stdenv.mkDerivation rec { - name = "${attr}-${version}"; - attr = if enableGUI then "giac-with-xcas" else "giac"; + pname = "giac${lib.optionalString enableGUI "-with-xcas"}"; version = "1.5.0-21"; # TODO try to remove preCheck phase on upgrade src = fetchurl { @@ -104,7 +103,7 @@ stdenv.mkDerivation rec { description = "A free computer algebra system (CAS)"; homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"; license = licenses.gpl3Plus; - platforms = platforms.unix; + platforms = platforms.linux ++ (optionals (!enableGUI) platforms.darwin); maintainers = [ maintainers.symphorien ]; }; }