diff options
author | adisbladis <adisbladis@gmail.com> | 2019-11-10 16:44:34 +0000 |
---|---|---|
committer | adisbladis <adisbladis@gmail.com> | 2019-11-18 20:10:43 +0000 |
commit | c9d8624ccddf17aee28745446b6763aabb26b4c7 (patch) | |
tree | e7caf27ce92b6bc9b94eb65246cb6c2913adca44 /pkgs/applications/science/math | |
parent | e6963bc983048c6f2b2d29efc5921a2d8f0c6e9c (diff) | |
download | nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.gz nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.bz2 nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.lz nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.xz nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.zst nixlib-c9d8624ccddf17aee28745446b6763aabb26b4c7.zip |
treewide: Get rid of libGLU_combined
Diffstat (limited to 'pkgs/applications/science/math')
-rw-r--r-- | pkgs/applications/science/math/giac/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/science/math/glsurf/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/math/gmsh/default.nix | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index 90b1b367a7c4..862761fe6fb5 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -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: diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 1cd5e364208a..d35e0f0453f7 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocamlPackages, libGLU_combined, freeglut +{ stdenv, fetchurl, ocamlPackages, libGLU, libGL, freeglut , libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng, giflib }: @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; - buildInputs = [ freeglut libGLU_combined libmysqlclient mpfr gmp + buildInputs = [ freeglut libGLU libGL libmysqlclient mpfr gmp libtiff libjpeg libpng giflib ] ++ (with ocamlPackages; [ ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 1d96c0039ad1..66c41bb073af 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg -, zlib, libGLU_combined, libGLU, xorg, opencascade-occt }: +, zlib, libGL, libGLU, xorg, opencascade-occt }: stdenv.mkDerivation rec { pname = "gmsh"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1p7hibmsgv961lfkzdxlgcvmcb0q155m2sp60r97cjsfzhw68g45"; }; - buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU_combined + buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU libGL libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE opencascade-occt |