about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2010-10-30 11:21:06 +0000
committerMichael Raskin <7c6f434c@mail.ru>2010-10-30 11:21:06 +0000
commit9af1c42473d3fe471b2f1bfc7e07e2991f2a7ba1 (patch)
tree22e2986805e356f5fd8231c958a3e72e5de11245 /pkgs
parente08d173663334b54a1538608437d1c84834f83e3 (diff)
downloadnixlib-9af1c42473d3fe471b2f1bfc7e07e2991f2a7ba1.tar
nixlib-9af1c42473d3fe471b2f1bfc7e07e2991f2a7ba1.tar.gz
nixlib-9af1c42473d3fe471b2f1bfc7e07e2991f2a7ba1.tar.bz2
nixlib-9af1c42473d3fe471b2f1bfc7e07e2991f2a7ba1.tar.lz
nixlib-9af1c42473d3fe471b2f1bfc7e07e2991f2a7ba1.tar.xz
nixlib-9af1c42473d3fe471b2f1bfc7e07e2991f2a7ba1.tar.zst
nixlib-9af1c42473d3fe471b2f1bfc7e07e2991f2a7ba1.zip
Pass BoehmGC to Nix
svn path=/nixpkgs/trunk/; revision=24540
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/package-management/nix/custom.nix2
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/tools/package-management/nix/custom.nix b/pkgs/tools/package-management/nix/custom.nix
index f87044d70456..2c9f0bbe9738 100644
--- a/pkgs/tools/package-management/nix/custom.nix
+++ b/pkgs/tools/package-management/nix/custom.nix
@@ -10,6 +10,7 @@
 , libxml2 ? null
 , docbook5_xsl ? null, libxslt ? null
 , docbook5 ? null, docbook_xml_dtd_43 ? null 
+, boehmgc ? null
 , configureFlags ? []
 , lib
 , enableScripts ? []
@@ -32,6 +33,7 @@ stdenv.mkDerivation {
   	++ (if docbook_xml_dtd_43 != null then [docbook_xml_dtd_43] else [])
   	++ (if w3m != null then [w3m] else [])
   	++ (if libxml2 != null then [libxml2] else [])
+  	++ (if boehmgc != null then [boehmgc] else [])
   ;
 
   preConfigure = 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9bfda0d26e02..779369cee78c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7022,7 +7022,7 @@ let
   nixCustomFun = src: preConfigure: enableScripts: configureFlags:
     import ../tools/package-management/nix/custom.nix {
       inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake
-        autoconf libtool configureFlags enableScripts lib bison libxml2;
+        autoconf libtool configureFlags enableScripts lib bison libxml2 boehmgc;
       flex = flex2533;
       aterm = aterm25;
       db4 = db45;