Merge branch 'master' into staging-next

zynaddsubfx conflict has been updated to 3.0.1, which conflicted with rewrite after 3.0.5 update on a different branch.
2021-01-08 02:07:34 +01:00
parent 5c072a088d 9414948a5a
commit e6c0c98940
64 changed files with 1092 additions and 930 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, liburcu, python }:
+{ stdenv, fetchurl, liburcu, python3 }:

 # NOTE:
 #   ./configure ...
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
    sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86";
  };

-  buildInputs = [ python ];
+  buildInputs = [ python3 ];

  preConfigure = ''
    patchShebangs .
  '';
-  
+
  propagatedBuildInputs = [ liburcu ];

  meta = with stdenv.lib; {