diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
commit | f8a8fc6c7c079de430fa528f688ddac781bcef16 (patch) | |
tree | 08c4f42540499cdac0331e8727cde16baabd08f4 /pkgs/applications/science/math/glsurf | |
parent | 6be720b3a756662bb31adfdc1948553a02057c16 (diff) | |
download | nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.gz nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.bz2 nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.lz nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.xz nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.zst nixlib-f8a8fc6c7c079de430fa528f688ddac781bcef16.zip |
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f3728bd64b80721c44ed1fb019978cbc1b, reversing changes made to f0fec244ca380b9d3e617ee7b419c59758c8b0f1. Let's delay this. We have some serious regressions.
Diffstat (limited to 'pkgs/applications/science/math/glsurf')
-rw-r--r-- | pkgs/applications/science/math/glsurf/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 1cd5e364208a..4de683cdce90 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ocamlPackages, libGLU_combined, freeglut -, libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng, giflib +, mysql, mpfr, gmp, libtiff, libjpeg, libpng, giflib }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; - buildInputs = [ freeglut libGLU_combined libmysqlclient 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 |