From 2c2cae89e644a43e0456bf62983755ffa0e03990 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 25 Jul 2003 19:03:24 +0000 Subject: [PATCH] * Added a package for expat. * Don't use GDBM in Subversion. svn path=/nixpkgs/trunk/; revision=205 --- pkgs/expat/expat-build.sh | 9 +++++++++ pkgs/expat/expat.fix | 12 ++++++++++++ pkgs/subversion/subversion-build.sh | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100755 pkgs/expat/expat-build.sh create mode 100644 pkgs/expat/expat.fix diff --git a/pkgs/expat/expat-build.sh b/pkgs/expat/expat-build.sh new file mode 100755 index 00000000000..6b6561f9914 --- /dev/null +++ b/pkgs/expat/expat-build.sh @@ -0,0 +1,9 @@ +#! /bin/sh + +. $stdenv/setup || exit 1 + +tar xvfz $src || exit 1 +cd expat-* || exit 1 +LDFLAGS=-Wl,-S ./configure --prefix=$out || exit 1 +make || exit 1 +make install || exit 1 diff --git a/pkgs/expat/expat.fix b/pkgs/expat/expat.fix new file mode 100644 index 00000000000..ad30a9906e1 --- /dev/null +++ b/pkgs/expat/expat.fix @@ -0,0 +1,12 @@ +Package( + [ ("name", "expat-1.95.6") + , ("build", Relative("expat/expat-build.sh")) + + , ("src", App(IncludeFix("fetchurl/fetchurl.fix"), + [ ("url", "http://belnet.dl.sourceforge.net/sourceforge/expat/expat-1.95.6.tar.gz") + , ("md5", "ca78d94e83e9f077b5da2bfe28ba986a") + ])) + + , ("stdenv", IncludeFix("stdenv/stdenv.fix")) + ] +) diff --git a/pkgs/subversion/subversion-build.sh b/pkgs/subversion/subversion-build.sh index 7e3fb956281..1ef53582c1f 100755 --- a/pkgs/subversion/subversion-build.sh +++ b/pkgs/subversion/subversion-build.sh @@ -26,7 +26,7 @@ echo "extra flags: $extraflags" tar xvfz $src || exit 1 cd subversion-* || exit 1 -LDFLAGS=-Wl,-S ./configure --prefix=$out $extraflags || exit 1 +LDFLAGS=-Wl,-S ./configure --prefix=$out $extraflags --without-gdbm || exit 1 make $extramakeflags || exit 1 make install $extramakeflags || exit 1