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

boost: Fix library dependencies

Browse Source
This commit is contained in:
William A. Kennington III 2014-10-08 14:01:00 -07:00
parent 529bd816c5
commit 9b61ab1823
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
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=$dev" "--includedir=$dev/include"
"--libdir=$lib/lib" "--libdir=$lib/lib"
"-j$NIX_BUILD_CORES" "-j$NIX_BUILD_CORES"
"--layout=${layout}" "--layout=${layout}"
@ -86,11 +86,11 @@ let
# Create a derivation which encompasses everything, making buildInputs nicer # Create a derivation which encompasses everything, making buildInputs nicer
mkdir -p $out/nix-support mkdir -p $out/nix-support
echo $dev >> $out/nix-support/propagated-build-inputs echo "$dev $lib" > $out/nix-support/propagated-native-build-inputs
echo $lib >> $out/nix-support/propagated-build-inputs
''; '';
commonConfigureFlags = [ commonConfigureFlags = [
"--includedir=$(dev)/include"
"--libdir=$(lib)/lib" "--libdir=$(lib)/lib"
]; ];
in in
@ -112,6 +112,10 @@ stdenv.mkDerivation {
sha256 = "07gz62nj767qzwqm3xjh11znpyph8gcii0cqhnx7wvismyn34iqk"; sha256 = "07gz62nj767qzwqm3xjh11znpyph8gcii0cqhnx7wvismyn34iqk";
}; };
preConfigure = ''
NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")"
'';
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ icu expat zlib bzip2 python ] buildInputs = [ icu expat zlib bzip2 python ]
@ -139,7 +143,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=$dev --without-icu ${concatStringsSep " " commonConfigureFlags}" export configureFlags="--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++ ;