swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

teyjus: 2.0b2 -> 2.1

Browse source
This commit is contained in:
Vincent Laporte 2016-12-02 19:35:11 +00:00
parent 895d3c8908
commit 7f501d7f02
3 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/compilers/teyjus/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, omake, ocaml, flex, bison }: { stdenv, fetchzip, omake, ocaml, flex, bison }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "teyjus-2.0b2"; name = "teyjus-2.1";
src = fetchurl { src = fetchzip {
url = "https://teyjus.googlecode.com/files/teyjus-source-2.0-b2.tar.gz"; url = https://github.com/teyjus/teyjus/archive/v2.1.tar.gz;
sha256 = "f589fb460d7095a6e674b7a6413772c41b98654c38602c3e8c477a976da99052"; sha256 = "064jqf68zpmvndgyhilmxfhnvx1bzm8avhgw82csj5wxw5ky6glz";
}; };
patches = [ ./fix-lex-to-flex.patch ]; patches = [ ./fix-lex-to-flex.patch ];

22
pkgs/development/compilers/teyjus/fix-lex-to-flex.patch
View file

@ -1,23 +1,23 @@
diff --git a/source/OMakefile b/source/OMakefile --- a/source/OMakefile 1970-01-01 00:00:01.000000000 +0000
index 6b19d84..095b8b6 100644 +++ b/source/OMakefile 2016-12-02 08:48:42.000000000 +0000
--- a/source/OMakefile @@ -183,18 +183,18 @@
+++ b/source/OMakefile
@@ -164,12 +164,17 @@ LNK_MAIN = $(FNT)/linkerfront
DEP_MAIN = $(FNT)/dependfront DEP_MAIN = $(FNT)/dependfront
PAR_MAIN = $(FNT)/parsefront
############################################################
+# Nixpkgs specific changes
+#
+
+LEX = flex +LEX = flex
+ +
+############################################################ ############################################################
# Platform specific changes # Platform specific changes
# #
if $(mem $(SYSNAME), Linux)
YACC = bison -by
- LEX = flex
export
if $(mem $(OSTYPE), Cygwin Win32) if $(mem $(OSTYPE), Cygwin Win32)
YACC = bison -by YACC = bison -by
- LEX = flex - LEX = flex
CFLAGS += -mno-cygwin CC = i686-pc-mingw32-gcc
INC_C[] += $(INC)/byteswap $(INC)/search INC_C[] += $(INC)/byteswap $(INC)/search
export export

4
pkgs/top-level/all-packages.nix
View file

@ -5295,9 +5295,7 @@ in
lua = lua5_1; lua = lua5_1;
}; };
teyjus = callPackage ../development/compilers/teyjus { teyjus = callPackage ../development/compilers/teyjus { };
omake = omake_rc1;
};
thrust = callPackage ../development/tools/thrust { thrust = callPackage ../development/tools/thrust {
gconf = pkgs.gnome2.GConf; gconf = pkgs.gnome2.GConf;