diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:38:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:38:09 +0200 |
| commit | 22a216849bf82ec65e3de86b7ea30e9c6b11efa4 (patch) | |
| tree | 8b425b2c80cb46a8f7a8d72beeb66777506d7bd6 /pkgs/applications/science/math/glsurf | |
| parent | 415b29939b01ca13f4667d5ffa8ede8ed262b0ee (diff) | |
| download | nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.gz nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.bz2 nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.lz nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.xz nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.zst nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.zip | |
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c079de430fa528f688ddac781bcef16.
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 4de683cdce9..1cd5e364208 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 -, mysql, mpfr, gmp, libtiff, libjpeg, libpng, giflib +, libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng, giflib }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; - buildInputs = [ freeglut libGLU_combined mysql.connector-c mpfr gmp + buildInputs = [ freeglut libGLU_combined libmysqlclient mpfr gmp libtiff libjpeg libpng giflib ] ++ (with ocamlPackages; [ ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl |