diff options
Diffstat (limited to 'pkgs')
29 files changed, 33 insertions, 38 deletions
diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix index 62fe41979294..0c8753085029 100644 --- a/pkgs/applications/altcoins/bitcoin-classic.nix +++ b/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 = { diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix index e678d6e4acb3..fd2d2f35bcb4 100644 --- a/pkgs/applications/altcoins/bitcoin-xt.nix +++ b/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" ]; diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 1a5746357113..7b4e7d54f323 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/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 = { diff --git a/pkgs/applications/altcoins/dashpay.nix b/pkgs/applications/altcoins/dashpay.nix index 2e9f17017a2d..ef42560ee9aa 100644 --- a/pkgs/applications/altcoins/dashpay.nix +++ b/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"; diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix index cf2f25bfeeef..c74f7ce7f241 100644 --- a/pkgs/applications/altcoins/dogecoin.nix +++ b/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 = { diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix index 4e0198b972d4..38e671e89940 100644 --- a/pkgs/applications/altcoins/litecoin.nix +++ b/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; { diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix index 0470fd21eaea..d30133fa5511 100644 --- a/pkgs/applications/altcoins/memorycoin.nix +++ b/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"; diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix index 360a39a4fd81..7d25a26fba25 100644 --- a/pkgs/applications/altcoins/primecoin.nix +++ b/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"; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 0dd4eab35f1e..28a264af965c 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/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 = [ diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index b7b923159117..da6bf44ced11 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/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" ]; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 31931aa75d92..f08595028cb3 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/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") diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index d8685da8d81f..6f8ebb994c5f 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/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 = [ diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 450c15bb65e3..c2ad0929f016 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/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" diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 0e4d2d797629..e6296bb045bb 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/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" diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 82b3f7aed095..0e30f0239bfc 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/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 diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index a5c14d0888ff..92a2f4fb6343 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/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 diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 05bd5ad980bd..ca86906d3e19 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/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" diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index c4086078d7d6..6a7424eb5cdf 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/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) ''; diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index 401743ac517f..a56425b8425b 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/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"; diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index e6f59ca8efeb..ab34f64dfbfc 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/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" ; 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 { diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 046b7f97ba44..63fb8de0fffc 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/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; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix index a5bb258af1a9..d840487b4a53 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix +++ b/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" ]; diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index d95443da359d..87aaaece53f6 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/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 ''; diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index 64ea6fa0e74b..46ecada96687 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/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 ''; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 955dd9ed667d..99cb9d03ab61 100644 --- a/pkgs/development/r-modules/default.nix +++ b/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" ]; }); diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 19457e136556..ad237e408c66 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/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") '' diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 556cb674212d..bbd4b185d5ec 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/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 \ diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index d5530a3df916..5015a220afb5 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/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; |