public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

boost: Change header output name

Browse Source
This commit is contained in:
William A. Kennington III 2014-09-30 12:32:44 -07:00
parent 9b9f716df2
commit 529bd816c5
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/boost/1.56.nix
View File

@ -46,7 +46,7 @@ let
withToolset = stdenv.lib.optionalString (toolset != null) "--with-toolset=${toolset}"; withToolset = stdenv.lib.optionalString (toolset != null) "--with-toolset=${toolset}";
genericB2Flags = [ genericB2Flags = [
"--prefix=$out" "--prefix=$dev"
"--libdir=$lib/lib" "--libdir=$lib/lib"
"-j$NIX_BUILD_CORES" "-j$NIX_BUILD_CORES"
"--layout=${layout}" "--layout=${layout}"
@ -78,11 +78,16 @@ let
installer = b2Args: '' installer = b2Args: ''
# boostbook is needed by some applications # boostbook is needed by some applications
mkdir -p $out/share/boostbook mkdir -p $dev/share/boostbook
cp -a tools/boostbook/{xsl,dtd} $out/share/boostbook/ cp -a tools/boostbook/{xsl,dtd} $dev/share/boostbook/
# Let boost install everything else # Let boost install everything else
./b2 ${b2Args} install ./b2 ${b2Args} install
# Create a derivation which encompasses everything, making buildInputs nicer
mkdir -p $out/nix-support
echo $dev >> $out/nix-support/propagated-build-inputs
echo $lib >> $out/nix-support/propagated-build-inputs
''; '';
commonConfigureFlags = [ commonConfigureFlags = [
@ -124,7 +129,7 @@ stdenv.mkDerivation {
installPhase = installer nativeB2Args; installPhase = installer nativeB2Args;
outputs = [ "out" "lib" ]; outputs = [ "out" "dev" "lib" ];
crossAttrs = rec { crossAttrs = rec {
buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ];
@ -134,7 +139,7 @@ stdenv.mkDerivation {
# We want to substitute the contents of configureFlags, removing thus the # We want to substitute the contents of configureFlags, removing thus the
# usual --build and --host added on cross building. # usual --build and --host added on cross building.
preConfigure = '' preConfigure = ''
export configureFlags="--prefix=$out --without-icu ${concatStringsSep " " commonConfigureFlags}" export configureFlags="--prefix=$dev --without-icu ${concatStringsSep " " commonConfigureFlags}"
set -x set -x
cat << EOF > user-config.jam cat << EOF > user-config.jam
using gcc : cross : $crossConfig-g++ ; using gcc : cross : $crossConfig-g++ ;