Merge branch 'master' into staging-next

2019-11-30 19:44:51 +01:00
parent d14baf7747 1edd4ceb61
commit a69ad18da9
66 changed files with 572 additions and 163 deletions
@@ -1,5 +1,5 @@
-  { stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2
-  , lv2, pkgconfig, libGLU, libGL }:
+{ stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2
+, lv2, pkgconfig, libGLU, libGL }:

  stdenv.mkDerivation {
  version = "0.9.0";