From 11ccd44e95c16b9f7fcf51e75b511b1b6587397b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun, 24 Oct 2010 21:48:59 +0000
Subject: * We need Bison 2.4 now.

---
 release.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'release.nix')

diff --git a/release.nix b/release.nix
index 695521d398f7..a34a202ae5a4 100644
--- a/release.nix
+++ b/release.nix
@@ -18,7 +18,7 @@ let
         inherit officialRelease;
 
         buildInputs =
-          [ curl bison flex2533 perl libxml2 libxslt w3m bzip2
+          [ curl bison24 flex2535 perl libxml2 libxslt w3m bzip2
             tetex dblatex nukeReferences
           ];
 
@@ -72,6 +72,7 @@ let
         configureFlags = ''
           --disable-init-state
           --with-bzip2=${bzip2}
+          --with-boehm-gc=${boehmgc}
         '';
       };
 
-- 
cgit 1.4.1


From 3d71c8013efa5d347b9767af54160b3d0fd9127b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri, 29 Oct 2010 14:00:47 +0000
Subject: * Use pkgconfig to locate the Boehm GC (as suggested by Ludo), if  
 --enable-gc is given.

---
 configure.ac | 14 +++++++-------
 release.nix  |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'release.nix')

diff --git a/configure.ac b/configure.ac
index 02eebf6924b7..f108c53beee4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -251,17 +251,17 @@ AC_SUBST(bzip2_bin_test)
 
 
 # Whether to use the Boehm garbage collector.
-AC_ARG_WITH(boehm-gc, AC_HELP_STRING([--with-boehm-gc=PATH],
-  [prefix of the Boehm GC package to enable garbage collection in the Nix expression evaluator]),
-  boehmgc=$withval, boehmgc=)
-if test -n "$boehmgc"; then
+AC_ARG_ENABLE(gc, AC_HELP_STRING([--enable-gc],
+  [enable garbage collection in the Nix expression evaluator (requires Boehm GC)]),
+  gc=$enableval, gc=)
+if test -n "$gc"; then
+  PKG_CHECK_MODULES([BDW_GC], [bdw-gc])
   boehmgc_lib="-L$boehmgc/lib -lgc"
-  CXXFLAGS="-I$boehmgc/include $CXXFLAGS"
+  CXXFLAGS="$BDW_GC_CFLAGS $CXXFLAGS"
   AC_DEFINE(HAVE_BOEHMGC, 1, [Whether to use the Boehm garbage collector.])
 fi
 AC_SUBST(boehmgc_lib)
-AC_SUBST(boehmgc_include)
-  
+
 
 AC_ARG_ENABLE(init-state, AC_HELP_STRING([--disable-init-state],
   [do not initialise DB etc. in `make install']),
diff --git a/release.nix b/release.nix
index a34a202ae5a4..c89d79a7d4c9 100644
--- a/release.nix
+++ b/release.nix
@@ -19,7 +19,7 @@ let
 
         buildInputs =
           [ curl bison24 flex2535 perl libxml2 libxslt w3m bzip2
-            tetex dblatex nukeReferences
+            tetex dblatex nukeReferences pkgconfig
           ];
 
         configureFlags = ''
@@ -67,12 +67,12 @@ let
         name = "nix";
         src = tarball;
 
-        buildInputs = [ curl perl bzip2 openssl ];
+        buildInputs = [ curl perl bzip2 openssl pkgconfig boehmgc ];
 
         configureFlags = ''
           --disable-init-state
           --with-bzip2=${bzip2}
-          --with-boehm-gc=${boehmgc}
+          --enable-gc
         '';
       };
 
-- 
cgit 1.4.1