diff options
author | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 15:12:44 +0200 |
---|---|---|
committer | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 17:06:49 +0200 |
commit | 0acec7e984ff38b7a296a459ba4b539a3b719c1b (patch) | |
tree | 1d60ce67493ab87f80acb127f4e26a11a0324c28 /pkgs/applications/science/math | |
parent | 1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a (diff) | |
download | nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.gz nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.bz2 nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.lz nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.xz nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.zst nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.zip |
treewide: transition mesa to 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 b2b052bdb159..e29ff24e250f 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, texlive, bison, flex , gmp, mpfr, pari, ntl, gsl, blas, mpfi, liblapackWithAtlas , readline, gettext, libpng, libao, gfortran, perl -, enableGUI ? false, mesa ? null, xorg ? null, fltk ? null +, enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null }: -assert enableGUI -> mesa != null && xorg != null && fltk != null; +assert enableGUI -> libGLU_combined != null && xorg != null && fltk != null; stdenv.mkDerivation rec { name = "${attr}-${version}"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # we want libgfortran.so.3 instead (stdenv.lib.getLib gfortran.cc) ] ++ stdenv.lib.optionals enableGUI [ - mesa fltk xorg.libX11 + libGLU_combined fltk xorg.libX11 ]; outputs = [ "out" ]; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 67dcfd8dc1de..798141b6b438 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocamlPackages, mesa, freeglut +{ stdenv, fetchurl, ocamlPackages, libGLU_combined, freeglut , mysql, mpfr, gmp, libtiff, libjpeg, libpng, giflib }: @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; - buildInputs = [ freeglut mesa mysql.connector-c mpfr gmp + buildInputs = [ freeglut libGLU_combined mysql.connector-c 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 31c4fe984770..96b800661a76 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg -, zlib, mesa, libGLU, xorg }: +, zlib, libGLU_combined, libGLU, xorg }: let version = "3.0.5"; in @@ -15,7 +15,7 @@ stdenv.mkDerivation { # that is supposed to work without Fortran but didn't for me. patches = [ ./CMakeLists.txt.patch ]; - buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib mesa + buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib libGLU_combined libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE ]; |