coq_HEAD: update to latest Git HEAD
This commit is contained in:
parent
4f2781019e
commit
686fa594ab
2 changed files with 25 additions and 3 deletions
|
@ -3,7 +3,7 @@
|
|||
{stdenv, fetchgit, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
|
||||
|
||||
let
|
||||
version = "8.5pre-8bc01590";
|
||||
version = "8.5pre-c70d5b2";
|
||||
buildIde = lablgtk != null;
|
||||
ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
|
||||
idePath = if buildIde then ''
|
||||
|
@ -16,17 +16,20 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchgit {
|
||||
url = git://scm.gforge.inria.fr/coq/coq.git;
|
||||
rev = "8bc0159095cb0230a50c55a1611c8b77134a6060";
|
||||
sha256 = "1cp4hbk9jw78y03vwz099yvixax161h60hsbyvwiwz2z5czjxzcv";
|
||||
rev = "c70d5b27ad5872c74e20b6c997383fb4462a68dc";
|
||||
sha256 = "02wks2aivgjcf4h3ss9rn683vyawz8gl8rbysdq7awxh062316l2";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
|
||||
|
||||
patches = [ ./no-codesign.patch ];
|
||||
|
||||
postPatch = ''
|
||||
UNAME=$(type -tp uname)
|
||||
RM=$(type -tp rm)
|
||||
substituteInPlace configure --replace "/bin/uname" "$UNAME"
|
||||
substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
|
||||
substituteInPlace Makefile.build --replace "ifeq (\$(ARCH),Darwin)" "ifeq (\$(ARCH),Darwinx)"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
|
|
19
pkgs/applications/science/logic/coq/no-codesign.patch
Normal file
19
pkgs/applications/science/logic/coq/no-codesign.patch
Normal file
|
@ -0,0 +1,19 @@
|
|||
diff --git a/Makefile.build b/Makefile.build
|
||||
index 2963a3d..876479c 100644
|
||||
--- a/Makefile.build
|
||||
+++ b/Makefile.build
|
||||
@@ -101,13 +101,8 @@ BYTEFLAGS=$(CAMLDEBUG) $(USERFLAGS)
|
||||
OPTFLAGS=$(CAMLDEBUGOPT) $(CAMLTIMEPROF) $(USERFLAGS)
|
||||
DEPFLAGS= $(LOCALINCLUDES) -I ide -I ide/utils
|
||||
|
||||
-ifeq ($(ARCH),Darwin)
|
||||
-LINKMETADATA=-ccopt "-sectcreate __TEXT __info_plist config/Info-$(notdir $@).plist"
|
||||
-CODESIGN=codesign -s -
|
||||
-else
|
||||
LINKMETADATA=
|
||||
CODESIGN=true
|
||||
-endif
|
||||
|
||||
define bestocaml
|
||||
$(if $(OPT),\
|
||||
|
Loading…
Reference in a new issue