diff options
-rw-r--r-- | pkgs/applications/science/math/glsurf/default.nix | 22 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 6 |
3 files changed, 17 insertions, 17 deletions
diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index eae4b0ceb62..3e4c8c70286 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchdarcs, ocaml, findlib, lablgl, camlimages, mesa, freeglut, ocaml_mysql, mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng, giflib }: +{ stdenv, fetchurl, ocamlPackages, mesa, freeglut +, mysql, mpfr, gmp, libtiff, libjpeg, libpng, giflib +}: stdenv.mkDerivation { - name = "glsurf-3.3"; + name = "glsurf-3.3.1"; - src = fetchdarcs { - url = "http://lama.univ-savoie.fr/~raffalli/GlSurf"; - rev = "3.3"; - sha256 = "0ljvvzz31j7l8rvsv63x1kj70nhw3al3k294m79hpmwjvym1mzfa"; + src = fetchurl { + url = "http://lama.univ-savoie.fr/~raffalli/glsurf/glsurf-3.3.1.tar.gz"; + sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; - buildInputs = [ ocaml findlib freeglut mesa - lablgl camlimages ocaml_mysql mysql.lib mlgmp mpfr gmp - libtiff libjpeg libpng giflib ]; + buildInputs = [ freeglut mesa mysql.lib mpfr gmp + libtiff libjpeg libpng giflib ] + ++ (with ocamlPackages; [ + ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl + ]); installPhase = '' mkdir -p $out/bin $out/share/doc/glsurf @@ -23,6 +26,5 @@ stdenv.mkDerivation { meta = { homepage = http://www.lama.univ-savoie.fr/~raffalli/glsurf; description = "A program to draw implicit surfaces and curves"; - broken = true; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 570bb3a5051..92bfbdef2af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7853,7 +7853,11 @@ with pkgs; glpk = callPackage ../development/libraries/glpk { }; - inherit (ocamlPackages) glsurf; + glsurf = callPackage ../applications/science/math/glsurf { + libpng = libpng12; + giflib = giflib_4_1; + ocamlPackages = ocaml-ng.ocamlPackages_4_01_0; + }; glui = callPackage ../development/libraries/glui {}; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 127f228bc9c..1038e13dbcd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -849,12 +849,6 @@ let else {} ); - glsurf = callPackage ../applications/science/math/glsurf { - libpng = pkgs.libpng12; - giflib = pkgs.giflib_4_1; - camlimages = camlimages_4_0; - }; - google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; |