summary refs log tree commit diff
path: root/pkgs/applications/science/math/glsurf
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2017-06-26 19:24:33 +0200
committerVincent Laporte <Vincent.Laporte@gmail.com>2017-06-26 19:24:33 +0200
commitac83ef3994e055cfba752476d1b1a673d94cd53e (patch)
tree9fddb19262c216c4f68ac45c51269b6ee77465b3 /pkgs/applications/science/math/glsurf
parenta9ba1e101e0eb59dc0292790604b4e90c347eafa (diff)
downloadnixpkgs-ac83ef3994e055cfba752476d1b1a673d94cd53e.tar
nixpkgs-ac83ef3994e055cfba752476d1b1a673d94cd53e.tar.gz
nixpkgs-ac83ef3994e055cfba752476d1b1a673d94cd53e.tar.bz2
nixpkgs-ac83ef3994e055cfba752476d1b1a673d94cd53e.tar.lz
nixpkgs-ac83ef3994e055cfba752476d1b1a673d94cd53e.tar.xz
nixpkgs-ac83ef3994e055cfba752476d1b1a673d94cd53e.tar.zst
nixpkgs-ac83ef3994e055cfba752476d1b1a673d94cd53e.zip
glsurf: 3.3 -> 3.3.1
Diffstat (limited to 'pkgs/applications/science/math/glsurf')
-rw-r--r--pkgs/applications/science/math/glsurf/default.nix22
1 files changed, 12 insertions, 10 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;
   };
 }