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

acgtk: fix for yojson ≥ 1.4

Browse Source
This commit is contained in:
Vincent Laporte 2017-11-27 05:37:11 +00:00
parent 6158563b45
commit a8da423332
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/science/logic/acgtk/default.nix
View File

@ -27,9 +27,11 @@ stdenv.mkDerivation {
patches = [ ./install-emacs-to-site-lisp.patch patches = [ ./install-emacs-to-site-lisp.patch
./use-nix-ocaml-byteflags.patch ]; ./use-nix-ocaml-byteflags.patch ];
postPatch = stdenv.lib.optionalString (camlp4 != null) '' postPatch = optionalString (camlp4 != null) ''
substituteInPlace src/Makefile.master.in \ substituteInPlace src/Makefile.master.in \
--replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4/" --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4/"
'' + optionalString (versionAtLeast (stdenv.lib.getVersion ocamlPackages.yojson) "1.4") ''
substituteInPlace src/scripting/Makefile.in --replace yojson.cmo yojson.cma
''; '';
# The bytecode executable is dependent on the dynamic library provided by # The bytecode executable is dependent on the dynamic library provided by