diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-28 00:41:28 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-28 00:41:28 +0300 |
| commit | b465dc202f0ba6e5ce465c5dabca2b2a3560cad6 (patch) | |
| tree | abc9a5465a2c880cd4c37144b948d098c7bc3573 /pkgs/development/libraries/boost | |
| parent | 4ff8f377afcfcb206c585f165dc1332c9fb1eba1 (diff) | |
boost: Kill unnecessary 'lib' output
This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
Diffstat (limited to 'pkgs/development/libraries/boost')
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 5b0c06bd6bb2..931a2ad8db63 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -53,7 +53,7 @@ let genericB2Flags = [ "--includedir=$dev/include" - "--libdir=$lib/lib" + "--libdir=$out/lib" "-j$NIX_BUILD_CORES" "--layout=${layout}" "variant=${variant}" @@ -90,10 +90,6 @@ let # Let boost install everything else ./b2 ${b2Args} install - - # Create a derivation which encompasses everything, making buildInputs nicer - mkdir -p $out/nix-support - echo "$dev $lib" > $out/nix-support/propagated-native-build-inputs ''; commonConfigureFlags = [ @@ -127,10 +123,9 @@ stdenv.mkDerivation { }; preConfigure = '' - NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")" if test -f tools/build/src/tools/clang-darwin.jam ; then substituteInPlace tools/build/src/tools/clang-darwin.jam \ - --replace '@rpath/$(<[1]:D=)' "$lib/lib/\$(<[1]:D=)"; + --replace '@rpath/$(<[1]:D=)' "$out/lib/\$(<[1]:D=)"; fi; '' + optionalString (mpi != null) '' cat << EOF > user-config.jam @@ -158,7 +153,7 @@ stdenv.mkDerivation { postFixup = fixup; - outputs = [ "out" "dev" "lib" ]; + outputs = [ "dev" "out" ]; setOutputFlags = false; crossAttrs = rec { |