From a8da423332da42287ef71a0e4c97ccede23a8f5e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 27 Nov 2017 05:37:11 +0000 Subject: [PATCH] =?UTF-8?q?acgtk:=20fix=20for=20yojson=20=E2=89=A5=201.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/acgtk/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index bd4ccea231b..e7668999229 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -27,9 +27,11 @@ stdenv.mkDerivation { patches = [ ./install-emacs-to-site-lisp.patch ./use-nix-ocaml-byteflags.patch ]; - postPatch = stdenv.lib.optionalString (camlp4 != null) '' + postPatch = optionalString (camlp4 != null) '' substituteInPlace src/Makefile.master.in \ --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