diff options
| author | Matthew Maurer <matthew.r.maurer@gmail.com> | 2017-01-25 02:05:54 -0500 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-03-29 06:37:00 +0000 |
| commit | 3c7b0d37ae68b0db3b14efa079aa36742edb5714 (patch) | |
| tree | ca761c6d8689c1c4db1d9fbe443498ee0068ec2c /pkgs/development/ocaml-modules | |
| parent | 078412521e4fbbec261b3a1a0a8296bfad0a47c3 (diff) | |
| download | nixpkgs-3c7b0d37ae68b0db3b14efa079aa36742edb5714.tar nixpkgs-3c7b0d37ae68b0db3b14efa079aa36742edb5714.tar.gz nixpkgs-3c7b0d37ae68b0db3b14efa079aa36742edb5714.tar.bz2 nixpkgs-3c7b0d37ae68b0db3b14efa079aa36742edb5714.tar.lz nixpkgs-3c7b0d37ae68b0db3b14efa079aa36742edb5714.tar.xz nixpkgs-3c7b0d37ae68b0db3b14efa079aa36742edb5714.tar.zst nixpkgs-3c7b0d37ae68b0db3b14efa079aa36742edb5714.zip | |
ocamlgraph: 1.8.5 -> 1.8.7
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/ocamlgraph/default.nix | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index 4f7c7914201..f6379c8b5a7 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -1,24 +1,22 @@ -{stdenv, fetchurl, ocaml, findlib, ocamlPackages }: +{stdenv, fetchurl, ocaml, findlib, lablgtk}: stdenv.mkDerivation rec { name = "ocamlgraph-${version}"; - version = "1.8.5"; + version = "1.8.7"; src = fetchurl { url = "http://ocamlgraph.lri.fr/download/ocamlgraph-${version}.tar.gz"; - sha256 = "0bxqxzd5sd7siz57vhzb8bmiz1ddhgdv49gcsmwwfmd16mj4cryi"; + sha256 = "1845r537swjil2fcj7lgbibc2zybfwqqasrd2s7bncajs83cl1nz"; }; - buildInputs = [ ocaml findlib ocamlPackages.lablgtk ocamlPackages.camlp4 ]; + buildInputs = [ ocaml findlib lablgtk ]; + + 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 = '' - sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(prefix)/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@+lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 -I ${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/stublibs@' configure Makefile.in editor/Makefile + sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml.version}/site-lib/ocamlgraph@' Makefile.in + sed -i 's@OCAMLFINDDEST := -destdir $(DESTDIR)@@' Makefile.in + sed -i 's@+lablgtk2@${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 -I ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/stublibs@' configure Makefile.in editor/Makefile ''; createFindlibDestdir = true; |