Author: kkallio
Date: Fri Jul 15 18:54:43 2011
New Revision: 27801
URL: https://svn.nixos.org/websvn/nix/?rev=27801&sc=1
Log:
Update version of urweb compiler.
Deleted:
nixpkgs/trunk/pkgs/development/compilers/urweb/remove-header-include-directory-prefix.patch
Modified:
nixpkgs/trunk/pkgs/development/compilers/urweb/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/urweb/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/urweb/default.nix Fri Jul 15
15:10:22 2011 (r27800)
+++ nixpkgs/trunk/pkgs/development/compilers/urweb/default.nix Fri Jul 15
18:54:43 2011 (r27801)
@@ -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}";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
