diff options
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/altcoins/bitcoin-classic.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/altcoins/bitcoin-xt.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/altcoins/bitcoin.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/altcoins/dashpay.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/altcoins/dogecoin.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/altcoins/litecoin.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/altcoins/memorycoin.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/altcoins/primecoin.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/graphics/synfigstudio/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/ekiga/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/p2p/qbittorrent/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/p2p/twister/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/office/libreoffice/still.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/version-management/gource/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/video/aegisub/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/video/mkvtoolnix/default.nix | 2 |
17 files changed, 17 insertions, 17 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" |