mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 14:22:50 +03:00
boost: Fix library dependencies
This commit is contained in:
parent
529bd816c5
commit
9b61ab1823
@ -46,7 +46,7 @@ let
|
||||
withToolset = stdenv.lib.optionalString (toolset != null) "--with-toolset=${toolset}";
|
||||
|
||||
genericB2Flags = [
|
||||
"--prefix=$dev"
|
||||
"--includedir=$dev/include"
|
||||
"--libdir=$lib/lib"
|
||||
"-j$NIX_BUILD_CORES"
|
||||
"--layout=${layout}"
|
||||
@ -86,11 +86,11 @@ let
|
||||
|
||||
# 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
|
||||
echo "$dev $lib" > $out/nix-support/propagated-native-build-inputs
|
||||
'';
|
||||
|
||||
commonConfigureFlags = [
|
||||
"--includedir=$(dev)/include"
|
||||
"--libdir=$(lib)/lib"
|
||||
];
|
||||
in
|
||||
@ -112,6 +112,10 @@ stdenv.mkDerivation {
|
||||
sha256 = "07gz62nj767qzwqm3xjh11znpyph8gcii0cqhnx7wvismyn34iqk";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [ icu expat zlib bzip2 python ]
|
||||
@ -139,7 +143,7 @@ stdenv.mkDerivation {
|
||||
# We want to substitute the contents of configureFlags, removing thus the
|
||||
# usual --build and --host added on cross building.
|
||||
preConfigure = ''
|
||||
export configureFlags="--prefix=$dev --without-icu ${concatStringsSep " " commonConfigureFlags}"
|
||||
export configureFlags="--without-icu ${concatStringsSep " " commonConfigureFlags}"
|
||||
set -x
|
||||
cat << EOF > user-config.jam
|
||||
using gcc : cross : $crossConfig-g++ ;
|
||||
|
Loading…
Reference in New Issue
Block a user