diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-10-08 14:13:01 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-11-02 17:22:27 -0800 |
| commit | ecfc1a7fc398482f8acecfd8fe93156a9750cee7 (patch) | |
| tree | 17053f42fcdb417d4f92ef964030ae87b46a8e16 /pkgs | |
| parent | 9b61ab1823b8391a7ec4f7e84706eca60a3aba29 (diff) | |
| download | nixpkgs-ecfc1a7fc398482f8acecfd8fe93156a9750cee7.tar nixpkgs-ecfc1a7fc398482f8acecfd8fe93156a9750cee7.tar.gz nixpkgs-ecfc1a7fc398482f8acecfd8fe93156a9750cee7.tar.bz2 nixpkgs-ecfc1a7fc398482f8acecfd8fe93156a9750cee7.tar.lz nixpkgs-ecfc1a7fc398482f8acecfd8fe93156a9750cee7.tar.xz nixpkgs-ecfc1a7fc398482f8acecfd8fe93156a9750cee7.tar.zst nixpkgs-ecfc1a7fc398482f8acecfd8fe93156a9750cee7.zip | |
Revert "boost: Quick eval fix"
This reverts commit eb3794186c7357c9cf1abc5d9162d16f29526996.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/boost/1.55.nix | 6 |
1 files 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; } +} |