diff options
author | William A. Kennington III <william@wkennington.com> | 2014-11-10 11:31:56 -0800 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2014-11-10 13:15:37 -0800 |
commit | 83cecbdcbcf1fa2d933a4bd2925e086bb7972008 (patch) | |
tree | ecaf3ee81930129b8460f5e9ee7b311bfa2b5f7a /pkgs/development/libraries/boost/generic.nix | |
parent | e78a1603fc872fe3894d49f1686ba18d9bc9eaff (diff) | |
download | nixpkgs-83cecbdcbcf1fa2d933a4bd2925e086bb7972008.tar nixpkgs-83cecbdcbcf1fa2d933a4bd2925e086bb7972008.tar.gz nixpkgs-83cecbdcbcf1fa2d933a4bd2925e086bb7972008.tar.bz2 nixpkgs-83cecbdcbcf1fa2d933a4bd2925e086bb7972008.tar.lz nixpkgs-83cecbdcbcf1fa2d933a4bd2925e086bb7972008.tar.xz nixpkgs-83cecbdcbcf1fa2d933a4bd2925e086bb7972008.tar.zst nixpkgs-83cecbdcbcf1fa2d933a4bd2925e086bb7972008.zip |
boost: Fix runtime dependencies in fixup instead of using a hook to fix binaries
Diffstat (limited to 'pkgs/development/libraries/boost/generic.nix')
-rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index ea2710c8e56..c53bb39717e 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, makeSetupHook +{ stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames , toolset ? null , enableRelease ? true , enableDebug ? false @@ -90,7 +90,7 @@ let # Create a derivation which encompasses everything, making buildInputs nicer mkdir -p $out/nix-support - echo "${stripHeaderPathHook} $dev $lib" > $out/nix-support/propagated-native-build-inputs + echo "$dev $lib" > $out/nix-support/propagated-native-build-inputs ''; commonConfigureFlags = [ @@ -98,7 +98,13 @@ let "--libdir=$(lib)/lib" ]; - stripHeaderPathHook = makeSetupHook { } ./strip-header-path.sh; + fixup = '' + # Make boost header paths relative so that they are not runtime dependencies + ( + cd "$dev" + find include \( -name '*.hpp' -or -name '*.h' \) -exec sed '1i#line 1 "{}"' -i '{}' \; + ) + ''; in @@ -144,6 +150,8 @@ stdenv.mkDerivation { installPhase = installer nativeB2Args; + postFixup = fixup; + outputs = [ "out" "dev" "lib" ]; crossAttrs = rec { @@ -162,5 +170,6 @@ stdenv.mkDerivation { ''; buildPhase = builder crossB2Args; installPhase = installer crossB2Args; + postFixup = fixup; }; } |