svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/libpng15/; revision=31568

pkgs/tools/graphics/asymptote/default.nix

@@ -20,7 +20,7 @@ rec {
 
   inherit (s) name;
   inherit buildInputs;
-  configureFlags = [];
+  configureFlags = "--enable-gc=${a.boehmgc} --enable-offscreen";
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["setVars" "doUnpack" "fixPaths" "extractTexinfoTex"
@@ -28,7 +28,6 @@ rec {
     "fixInfoDir"];
 
   setVars = a.noDepEntry ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.boehmgc}/include/gc"
     export HOME="$PWD"
   '';