Merge staging-next into staging

2019-04-16 18:54:15 +02:00
parent 48a941c5a3 741eaa2ede
commit bae32a9f5c
548 changed files with 16308 additions and 7742 deletions
--- a/pkgs/development/libraries/audio/lvtk/default.nix
+++ b/pkgs/development/libraries/audio/lvtk/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
    sed -i '/target[ ]*= "ttl2c"/ ilib=["boost_system"],' tools/wscript_build
  '';

-  configureFlags = [
+  wafConfigureFlags = [
    "--boost-includes=${boost.dev}/include"
    "--boost-libs=${boost.out}/lib"
  ];