Merge staging into staging-next

2021-03-08 19:20:18 +01:00
parent 6ba8f344c6 042adf08d1
commit 277d488026
374 changed files with 3871 additions and 2493 deletions
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {

  patches = [ ./META.patch ];

-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ ocaml automake gnum4 autoconf unzip
+  nativeBuildInputs = [ pkg-config unzip ];
+  buildInputs = [ ocaml automake gnum4 autoconf
                  findlib freetype lablgtk cairo gdk-pixbuf gtk2 pango ];

  createFindlibDestdir = true;