diff options
| author | Benno Fünfstück <benno.fuenfstueck@gmail.com> | 2017-03-06 12:51:03 +0100 |
|---|---|---|
| committer | Benno Fünfstück <benno.fuenfstueck@gmail.com> | 2017-03-06 12:51:03 +0100 |
| commit | dd23d08b9047b74254723e3e54086ce9b656b694 (patch) | |
| tree | e742f49e2636b06b63359fb1dea142cbc1d9b6e8 /pkgs/development | |
| parent | 029c3f917edbe4a53fdd17cd797ca6ff9e8a7615 (diff) | |
ocamlgraph: fix binary location (binaries had double prefix path)
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.
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/ocaml-modules/ocamlgraph/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index 579571ef6253..4f7c79142019 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -11,14 +11,12 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlPackages.lablgtk ocamlPackages.camlp4 ]; - 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@$(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@+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 ''; |