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

ocamlgraph: fix binary location (binaries had double prefix path)

Browse Source 
Due to setting `DESTDIR` *and* `exec_prefix` (defaulted to `$prefix`), binaries
ended up in `$out/$out/bin` instead of just $out/bin. Not setting `DESTDIR` and adapting
the `LIBDIR` patch a little fixes this issue.
This commit is contained in:
Benno Fünfstück 2017-03-06 12:51:03 +01:00
parent 029c3f917e
commit dd23d08b90
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,14 +11,12 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml findlib ocamlPackages.lablgtk ocamlPackages.camlp4 ]; buildInputs = [ ocaml findlib ocamlPackages.lablgtk ocamlPackages.camlp4 ];
patches = ./destdir.patch;
# some patching is required so that the lablgtk2 library is taken into account. It # 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: # does not reside in a subdirectory of the default library path, hence:
# * configure looked in the wrong path # * configure looked in the wrong path
# * ocaml needs that directory and the stubs directory as -I flag # * 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@$(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@$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@+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
''; '';