Merge branch 'staging-next' into staging

2021-03-26 07:53:44 +01:00
parent 15151dabaf 26fdaef6b2
commit b3c854b60b
195 changed files with 3269 additions and 1871 deletions
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkg-config, perlPackages,
-libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
+libxml2, gettext, python2, libxml2Python, docbook5, docbook_xsl,
 libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui,
 gtk-mac-integration-gtk2 }:

@@ -18,7 +18,7 @@ stdenv.mkDerivation {
  ];

  buildInputs =
-    [ gtk2 libxml2 gettext python libxml2Python docbook5
+    [ gtk2 libxml2 gettext python2 libxml2Python docbook5
      libxslt docbook_xsl libart_lgpl ]
      ++ lib.optional withGNOME libgnomeui
      ++ lib.optional stdenv.isDarwin gtk-mac-integration-gtk2;