public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlgraph: update to 1.8.2

Browse Source 
Also added the dependency on lablgtk, so that it builds the 'dgraph' module,
which is needed for packaging frama-c. This dependency can be made optional.
This commit is contained in:
Arie Middelkoop 2012-07-12 17:22:45 +02:00
parent b5d4e8a17a
commit 7d70836580
2 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/ocaml-modules/ocamlgraph/default.nix
View File

@ -1,8 +1,8 @@
{stdenv, fetchurl, ocaml, findlib }: {stdenv, fetchurl, ocaml, findlib, ocamlPackages }:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version; ocaml_version = (builtins.parseDrvName ocaml.name).version;
version = "1.8.1"; version = "1.8.2";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -10,15 +10,21 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "http://ocamlgraph.lri.fr/download/ocamlgraph-${version}.tar.gz"; url = "http://ocamlgraph.lri.fr/download/ocamlgraph-${version}.tar.gz";
sha256 = "0hrba69wvw9b42irkvjf6q7zzw12v5nyyc33yaq3jlf1qbzqhqxs"; sha256 = "e54ae60cd977a032854166dad56348d0fb76c6cd8e03e960af455268f0c8b5a6";
}; };
buildInputs = [ ocaml findlib ]; buildInputs = [ ocaml findlib ocamlPackages.lablgtk ];
patches = ./destdir.patch; patches = ./destdir.patch;
# some patching is required so that the lablgtk2 library is taken into account. It
# does not reside in a subdirectory of the default library path, hence:
# * configure looked in the wrong path
# * ocaml needs that directory and the stubs directory as -I flag
postPatch = '' postPatch = ''
sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml_version}/site-lib/ocamlgraph@' Makefile.in sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml_version}/site-lib/ocamlgraph@' Makefile.in
sed -i 's@$OCAMLLIB/lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2@' configure Makefile.in
sed -i 's@-I +lablgtk2@-I ${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2 -I ${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/stublibs@' configure Makefile.in editor/Makefile
''; '';
createFindlibDestdir = true; createFindlibDestdir = true;

29
pkgs/development/tools/misc/frama-c/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, fetchurl, ocamlPackages }:
let
version = "20111001";
sha256 = "8afad848321c958fab265045cd152482e77ce7c175ee7c9af2d4bec57a1bc671";
in stdenv.mkDerivation {
name = "frama-c-${version}";
src = fetchurl {
url = "http://frama-c.com/download/frama-c-Nitrogen-${version}.tar.gz";
inherit sha256;
};
buildInputs = with ocamlPackages; [
ocaml findlib
];
meta = {
description = "Frama-C is an extensible tool for source-code analysis of C software";
homepage = http://frama-c.com/;
license = "GPLv2";
maintainers = [ stdenv.lib.maintainers.amiddelk ];
platforms = stdenv.lib.platforms.gnu;
};
}