nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 16:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

glsurf: 3.3 -> 3.3.1

Browse Source
This commit is contained in:
Vincent Laporte 2017-06-26 19:24:33 +02:00
parent a9ba1e101e
commit ac83ef3994
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/science/math/glsurf/default.nix
View File

@ -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 { stdenv.mkDerivation {
name = "glsurf-3.3"; name = "glsurf-3.3.1";
src = fetchdarcs { src = fetchurl {
url = "http://lama.univ-savoie.fr/~raffalli/GlSurf"; url = "http://lama.univ-savoie.fr/~raffalli/glsurf/glsurf-3.3.1.tar.gz";
rev = "3.3"; sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
sha256 = "0ljvvzz31j7l8rvsv63x1kj70nhw3al3k294m79hpmwjvym1mzfa";
}; };
buildInputs = [ ocaml findlib freeglut mesa buildInputs = [ freeglut mesa mysql.lib mpfr gmp
lablgl camlimages ocaml_mysql mysql.lib mlgmp mpfr gmp libtiff libjpeg libpng giflib ]
libtiff libjpeg libpng giflib ]; ++ (with ocamlPackages; [
ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl
]);
installPhase = '' installPhase = ''
mkdir -p $out/bin $out/share/doc/glsurf mkdir -p $out/bin $out/share/doc/glsurf
@ -23,6 +26,5 @@ stdenv.mkDerivation {
meta = { meta = {
homepage = http://www.lama.univ-savoie.fr/~raffalli/glsurf; homepage = http://www.lama.univ-savoie.fr/~raffalli/glsurf;
description = "A program to draw implicit surfaces and curves"; description = "A program to draw implicit surfaces and curves";
broken = true;
}; };
} }

6
pkgs/top-level/all-packages.nix
View File

@ -7853,7 +7853,11 @@ with pkgs;
glpk = callPackage ../development/libraries/glpk { }; 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 {}; glui = callPackage ../development/libraries/glui {};

6
pkgs/top-level/ocaml-packages.nix
View File

@ -849,12 +849,6 @@ let
else {} 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 { }; google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };