Merge staging-next into staging

2021-05-16 01:01:01 +00:00
parent 4236fb1c7f b484cef365
commit 9911b1c75b
41 changed files with 3677 additions and 198 deletions
@@ -5,6 +5,8 @@
 , libsndfile
 , libvorbis
 , ncurses
+, which
+, pkg-config
 , lib, stdenv }:

 stdenv.mkDerivation rec {
@@ -19,6 +21,7 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-xVC/iE71W/Wdy5aPGH9DtcVAHWCcg3HkEA3iDV6OYUo=";
  };

+  nativeBuildInputs = [ which pkg-config ];
  buildInputs = [ libao libmodplug libsamplerate libsndfile libvorbis ncurses ];
  preBuild = ''
    makeFlagsArray+=(