diff options
| author | Karn Kallio <tierpluspluslists@gmail.com> | 2011-07-15 18:54:43 +0000 |
|---|---|---|
| committer | Karn Kallio <tierpluspluslists@gmail.com> | 2011-07-15 18:54:43 +0000 |
| commit | abbf22c397ce6a5fe76ef2cd5ab1cc7acd09a7dd (patch) | |
| tree | 659971ebe3fba5deadc13d5fb017cc255ee6a4df /pkgs/development/compilers/urweb | |
| parent | 5693872dc10836094ea4fce381a522e96bf93aaa (diff) | |
| download | nixpkgs-abbf22c397ce6a5fe76ef2cd5ab1cc7acd09a7dd.tar nixpkgs-abbf22c397ce6a5fe76ef2cd5ab1cc7acd09a7dd.tar.gz nixpkgs-abbf22c397ce6a5fe76ef2cd5ab1cc7acd09a7dd.tar.bz2 nixpkgs-abbf22c397ce6a5fe76ef2cd5ab1cc7acd09a7dd.tar.lz nixpkgs-abbf22c397ce6a5fe76ef2cd5ab1cc7acd09a7dd.tar.xz nixpkgs-abbf22c397ce6a5fe76ef2cd5ab1cc7acd09a7dd.tar.zst nixpkgs-abbf22c397ce6a5fe76ef2cd5ab1cc7acd09a7dd.zip | |
Update version of urweb compiler.
svn path=/nixpkgs/trunk/; revision=27801
Diffstat (limited to 'pkgs/development/compilers/urweb')
| -rw-r--r-- | pkgs/development/compilers/urweb/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/development/compilers/urweb/remove-header-include-directory-prefix.patch | 24 |
2 files changed, 9 insertions, 31 deletions
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 6db4eb9961e..89501df648b 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -2,27 +2,29 @@ stdenv.mkDerivation rec { pname = "urweb"; - version = "20110517"; + version = "20110715"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.impredicative.com/ur/${name}.tgz"; - sha256 = "1jmaj62laf8q4f07jrg6r2gb1ky120n21qfzpia3q5j5ihjiavb1"; + sha256 = "1qaz6alabhi7jmpsj7x0x4sskkjf05619maym133y2lkgdnvhydh"; }; buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ]; - patches = [ ./remove-header-include-directory-prefix.patch ]; - - postPatch = '' + prePatch = '' sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure sed -e 's@gcc @${stdenv.gcc}/bin/gcc @g' -i src/compiler.sml ''; preConfigure = '' - export GCCARGS="-I$out/include -I${mysql}/include/mysql -I${postgresql}/include -I${sqlite}/include \ - -L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib" + export GCCARGS="-I$out/include \ + -L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib"; + + export PGHEADER="${postgresql}/include/libpq-fe.h"; + export MSHEADER="${mysql}/include/mysql/mysql.h"; + export SQHEADER="${sqlite}/include/sqlite3.h"; ''; configureFlags = "--with-openssl=${openssl}"; diff --git a/pkgs/development/compilers/urweb/remove-header-include-directory-prefix.patch b/pkgs/development/compilers/urweb/remove-header-include-directory-prefix.patch deleted file mode 100644 index a7c7c2da9c5..00000000000 --- a/pkgs/development/compilers/urweb/remove-header-include-directory-prefix.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur urweb-orig/src/mysql.sml urweb-patched/src/mysql.sml ---- urweb-orig/src/mysql.sml 2010-08-23 15:36:58.665234434 -0430 -+++ urweb-patched/src/mysql.sml 2010-08-23 15:44:10.765238334 -0430 -@@ -1521,7 +1521,7 @@ - fun p_blank _ = "?" - - val () = addDbms {name = "mysql", -- header = "mysql/mysql.h", -+ header = "mysql.h", - link = "-lmysqlclient", - init = init, - p_sql_type = p_sql_type, -diff -Naur urweb-orig/src/postgres.sml urweb-patched/src/postgres.sml ---- urweb-orig/src/postgres.sml 2010-08-23 15:36:58.666253464 -0430 -+++ urweb-patched/src/postgres.sml 2010-08-23 15:43:26.216251221 -0430 -@@ -928,7 +928,7 @@ - fun p_blank (n, t) = p_cast ("$" ^ Int.toString n, t) - - val () = addDbms {name = "postgres", -- header = "postgresql/libpq-fe.h", -+ header = "libpq-fe.h", - link = "-lpq", - p_sql_type = p_sql_type, - init = init, |