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.

pkgs/applications/altcoins/bitcoin-classic.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
                   miniupnpc utillinux protobuf ]
                   ++ optionals withGui [ qt4 qrencode ];
 
-  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt4" ];
 
   meta = {

pkgs/applications/altcoins/bitcoin-xt.nix

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec{
                   ++ optionals withGui [ qt4 qrencode ];
 
   configureFlags = [
-    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-boost-libdir=${boost.out}/lib"
     "--with-libcurl-headers=${curl.dev}/include"
   ] ++ optionals withGui [ "--with-gui=qt4" ];
 

pkgs/applications/altcoins/bitcoin.nix

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec{
                   ++ optionals stdenv.isLinux [ utillinux ]
                   ++ optionals withGui [ qt4 qrencode ];
 
-  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt4" ];
 
   meta = {

pkgs/applications/altcoins/dashpay.nix

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig autoreconfHook glib openssl db48 yasm
                   boost zlib miniupnpc protobuf qt4 qrencode utillinux ];
 
-  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ];
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
 
   meta = with stdenv.lib; {
     version = "0.12.0.55";

pkgs/applications/altcoins/dogecoin.nix

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [ "--with-incompatible-bdb"
-                     "--with-boost-libdir=${boost.lib}/lib" ]
+                     "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui" ];
 
   meta = {

pkgs/applications/altcoins/litecoin.nix

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
                   openssl db48 boost zlib miniupnpc glib protobuf utillinux ]
                   ++ optionals withGui [ qt4 qrencode ];
 
-  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt4" ];
 
   meta = with stdenv.lib; {

pkgs/applications/altcoins/memorycoin.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec{
                   miniupnpc utillinux protobuf ]
                   ++ optionals withGui [ qt4 qmake4Hook qrencode ];
 
-  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt4" ];
 
   preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile";

pkgs/applications/altcoins/primecoin.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec{
                   miniupnpc utillinux protobuf ]
                   ++ optionals withGui [ qt4 qmake4Hook qrencode ];
 
-  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt4" ];
 
   preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile";

pkgs/applications/graphics/synfigstudio/default.nix

@@ -35,7 +35,7 @@ let
 
     configureFlags = [
       "--with-boost=${boost.dev}"
-      "--with-boost-libdir=${boost.lib}/lib"
+      "--with-boost-libdir=${boost.out}/lib"
     ];
 
     buildInputs = [

pkgs/applications/networking/instant-messengers/ekiga/default.nix

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-ldap-dir=${openldap}"
     "--with-libsasl2-dir=${cyrus_sasl}"
-    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-boost-libdir=${boost.out}/lib"
     "--disable-gconf"
   ];
 

pkgs/applications/networking/p2p/qbittorrent/default.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     ++ optional guiSupport dbus_libs;
 
   configureFlags = [
-    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-boost-libdir=${boost.out}/lib"
     "--with-boost=${boost.dev}"
     (if guiSupport then "" else "--disable-gui")
     (if webuiSupport then "" else "--disable-webui")

pkgs/applications/networking/p2p/twister/default.nix

@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
     "--disable-deprecated-functions"
     "--enable-tests"
     "--enable-python-binding"
-    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-boost-libdir=${boost.out}/lib"
   ];
 
   buildInputs = [

pkgs/applications/office/libreoffice/default.nix

@@ -172,7 +172,7 @@ in stdenv.mkDerivation rec {
   configureFlags = [
     "${if withHelp then "" else "--without-help"}"
     "--with-boost=${boost.dev}"
-    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-boost-libdir=${boost.out}/lib"
     "--with-beanshell-jar=${bsh}"
     "--with-vendor=NixOS"
     "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"

pkgs/applications/office/libreoffice/still.nix

@@ -172,7 +172,7 @@ in stdenv.mkDerivation rec {
   configureFlags = [
     "${if withHelp then "" else "--without-help"}"
     "--with-boost=${boost.dev}"
-    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-boost-libdir=${boost.out}/lib"
     "--with-beanshell-jar=${bsh}"
     "--with-vendor=NixOS"
     "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"

pkgs/applications/version-management/gource/default.nix

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     boost glm
   ];
 
-  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ];
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
 
   NIX_CFLAGS_COMPILE = "-fpermissive " + # fix build with newer gcc versions
                        "-std=c++11"; # fix build with glm >= 0.9.6.0

pkgs/applications/video/aegisub/default.nix

@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = with stdenv.lib;
   [ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa
-    libass fftw ffms ffmpeg zlib icu boost boost.lib libiconv
+    libass fftw ffms ffmpeg zlib icu boost boost.out libiconv
   ]
     ++ optional spellcheckSupport hunspell
     ++ optional automationSupport lua

pkgs/applications/video/mkvtoolnix/default.nix

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-magic"
     "--enable-optimization"
-    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-boost-libdir=${boost.out}/lib"
     "--disable-debug"
     "--disable-profiling"
     "--disable-precompiled-headers"

pkgs/development/interpreters/pixie/default.nix

@@ -22,7 +22,7 @@ let
     url = "https://bitbucket.org/pypy/pypy/get/${pypy-tag}.tar.bz2";
     sha256 = "1cs9xqs1rmzdcnwxxkbvy064s5cbp6vvzhn2jmyzh5kg4di1r3bn";
   };
-  libs = [ libffi libedit libuv boost.dev boost.lib zlib ];
+  libs = [ libffi libedit libuv boost.dev boost.out zlib ];
   include-path = stdenv.lib.concatStringsSep ":"
                    (map (p: "${p}/include") libs);
   library-path = stdenv.lib.concatStringsSep ":"
@@ -47,7 +47,7 @@ let
     patchPhase = ''
       (cd pixie-src
        patch -p1 < ${./load_paths.patch}
-       libraryPaths='["${libuv}" "${libedit}" "${libffi}" "${boost.dev}" "${boost.lib}" "${zlib}"]'
+       libraryPaths='["${libuv}" "${libedit}" "${libffi}" "${boost.dev}" "${boost.out}" "${zlib}"]'
        export libraryPaths
        substituteAllInPlace ./pixie/ffi-infer.pxi)
     '';

pkgs/development/libraries/audio/lvtk/default.nix

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   configurePhase = ''
     python waf configure --prefix=$out \
       --boost-includes="${boost.dev}/include" \
-      --boost-libs="${boost.lib}/lib"
+      --boost-libs="${boost.out}/lib"
   '';
 
   buildPhase = "python waf";

pkgs/development/libraries/blitz/default.nix

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   patches = [ ./blitz-gcc47.patch ./blitz-testsuite-stencil-et.patch ];
 
   buildInputs = [ pkgconfig gfortran texinfo ]
-    ++ optional (boost != null) [ boost.lib ];
+    ++ optional (boost != null) [ boost.out ];
 
   configureFlags =
     [ "--enable-shared"
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     ++ optional enablePadding "--enable-array-length-padding"
     ++ optional enableSerialization "--enable-serialization"
     ++ optionals (boost != null) [ "--with-boost=${boost.dev}"
-                                   "--with-boost-libdir=${boost.lib}/lib" ]
+                                   "--with-boost-libdir=${boost.out}/lib" ]
     ++ optional stdenv.is64bit "--enable-64bit"
     ;
 

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 {

pkgs/development/libraries/folly/default.nix

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     patchShebangs build
   '';
 
-  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ];
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
 
   enableParallelBuilding = true;
 

pkgs/development/libraries/libtorrent-rasterbar/generic.nix

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     "--with-libgeoip=system"
     "--with-libiconv=yes"
     "--with-boost=${boost.dev}"
-    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-boost-libdir=${boost.out}/lib"
     "--with-libiconv=yes"
   ];
 

pkgs/development/libraries/ndn-cxx/default.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     ./waf configure \
       --with-cryptopp=${cryptopp} \
       --boost-includes=${boost.dev}/include \
-      --boost-libs=${boost.lib}/lib \
+      --boost-libs=${boost.out}/lib \
       --with-examples \
       --prefix=$out
   '';

pkgs/development/libraries/swiften/default.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     patchShebangs ./scons
     ./scons openssl=${openssl} \
             boost_includedir=${boost.dev}/include \
-            boost_libdir=${boost.lib}/lib \
+            boost_libdir=${boost.out}/lib \
             boost_bundled_enable=false \
             SWIFTEN_INSTALLDIR=$out $out
   '';

pkgs/development/r-modules/default.nix

@@ -1866,7 +1866,7 @@ let
 
     RVowpalWabbit = old.RVowpalWabbit.overrideDerivation (attrs: {
       configureFlags = [
-        "--with-boost=${pkgs.boost.dev}" "--with-boost-libdir=${pkgs.boost.lib}/lib"
+        "--with-boost=${pkgs.boost.dev}" "--with-boost-libdir=${pkgs.boost.out}/lib"
       ];
     });
 

pkgs/tools/filesystems/ceph/generic.nix

@@ -267,7 +267,7 @@ stdenv.mkDerivation {
 
     # Fix .la file link dependencies
     find "$lib/lib" -name \*.la | xargs sed -i \
-      -e 's,-lboost_[a-z]*,-L${boost.lib}/lib \0,g' \
+      -e 's,-lboost_[a-z]*,-L${boost.out}/lib \0,g' \
   '' + optionalString (cryptoStr == "cryptopp") ''
       -e 's,-lcryptopp,-L${optCryptopp}/lib \0,g' \
   '' + optionalString (cryptoStr == "nss") ''

pkgs/tools/filesystems/xtreemfs/default.nix

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     export ANT_HOME=${ant}
 
     export BOOST_INCLUDEDIR=${boost.dev}/include
-    export BOOST_LIBRARYDIR=${boost.lib}/lib
+    export BOOST_LIBRARYDIR=${boost.out}/lib
     export OPENSSL_ROOT_DIR=${openssl}
 
     substituteInPlace cpp/cmake/FindValgrind.cmake \

pkgs/tools/text/source-highlight/default.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ boost ];
 
-  configureFlags = [ "--with-boost=${boost.lib}" ];
+  configureFlags = [ "--with-boost=${boost.out}" ];
 
   enableParallelBuilding = false;