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

treewide: Get rid of libGLU_combined

Browse Source
This commit is contained in:
adisbladis
2019-11-18 20:10:43 +00:00
parent e6963bc983
commit c9d8624ccd
241 changed files with 518 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/math/giac/default.nix
+3 -3
View File
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, fetchpatch, texlive, bison, flex, liblapack
, gmp, mpfr, pari, ntl, gsl, blas, mpfi, ecm, glpk, nauty
, readline, gettext, libpng, libao, gfortran, perl
, enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null
, enableGUI ? false, libGL ? null, libGLU ? null, xorg ? null, fltk ? null
}:
assert enableGUI -> libGLU_combined != null && xorg != null && fltk != null;
assert enableGUI -> libGLU != null && libGL != null && xorg != null && fltk != null;
stdenv.mkDerivation rec {
name = "${attr}-${version}";
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
(stdenv.lib.getLib gfortran.cc)
liblapack
] ++ stdenv.lib.optionals enableGUI [
libGLU_combined fltk xorg.libX11
libGL libGLU fltk xorg.libX11
];
/* fixes: