mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 10:00:56 +00:00
Code Issues Wiki Activity
nixpkgs/pkgs/applications/science/logic/coq/configure.patch

21 lines
823 B
Diff
Raw Normal View History

Update Coq svn path=/nixpkgs/trunk/; revision=24597
2010-11-04 11:24:27 +00:00
diff -Nuar coq-8.3/configure coq-8.3.nixos/configure
--- coq-8.3/configure 2010-10-14 16:02:46.000000000 +0200
+++ coq-8.3.nixos/configure 2010-11-04 09:57:16.000000000 +0100
@@ -394,7 +394,6 @@
Add coq-8.3rc1 Note: In this version we introduce a new schema for the name of the coq derivations where the coq version is included in the name (i.e., "coq8.3-8.3pre1" instead of "coq-8.3pre1"). The reason for this is that often coq releases introduce several incompatibilities. Thus I argue that, in general, users do not want nix-env to upgrade automatically form one release to another. Also version string "8.3pre1" is used instead of "8.3-rc1" to trigger the nix mechanism for versions comparison. svn path=/nixpkgs/trunk/; revision=23803
2010-09-14 22:15:58 +01:00
ocamlyaccexec=$CAMLBIN/ocamlyacc
ocamlmktopexec=$CAMLBIN/ocamlmktop
ocamlmklibexec=$CAMLBIN/ocamlmklib
- camlp4oexec=$CAMLBIN/camlp4o
esac
if test ! -f "$CAMLC" ; then
Update Coq svn path=/nixpkgs/trunk/; revision=24597
2010-11-04 11:24:27 +00:00
@@ -637,7 +636,7 @@
Add coq-8.3rc1 Note: In this version we introduce a new schema for the name of the coq derivations where the coq version is included in the name (i.e., "coq8.3-8.3pre1" instead of "coq-8.3pre1"). The reason for this is that often coq releases introduce several incompatibilities. Thus I argue that, in general, users do not want nix-env to upgrade automatically form one release to another. Also version string "8.3pre1" is used instead of "8.3-rc1" to trigger the nix mechanism for versions comparison. svn path=/nixpkgs/trunk/; revision=23803
2010-09-14 22:15:58 +01:00
no) LABLGTKLIB=+lablgtk2 # Pour le message
LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile
yes) LABLGTKLIB="$lablgtkdir" # Pour le message
- LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile
+ LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile
esac;;
no) LABLGTKINCLUDES="";;
esac
Copy permalink