From ecfc1a7fc398482f8acecfd8fe93156a9750cee7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 8 Oct 2014 14:13:01 -0700
Subject: [PATCH] Revert "boost: Quick eval fix"

This reverts commit eb3794186c7357c9cf1abc5d9162d16f29526996.
---
 pkgs/development/libraries/boost/1.55.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix
index 31469b3e06c..56a5b408c36 100644
--- a/pkgs/development/libraries/boost/1.55.nix
+++ b/pkgs/development/libraries/boost/1.55.nix
@@ -40,7 +40,7 @@ let
   withToolset = stdenv.lib.optionalString (toolset != null) " --with-toolset=${toolset}";
 in
 
-let res = stdenv.mkDerivation {
+stdenv.mkDerivation {
   name = "boost-1.55.0";
 
   meta = {
@@ -59,6 +59,8 @@ let res = stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
+  outputs = [ "out" "lib" ];
+
   buildInputs =
     [ icu expat zlib bzip2 python ]
     ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
@@ -96,4 +98,4 @@ let res = stdenv.mkDerivation {
       ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
     '';
   };
-}; in res // { lib = res; }
+}