Merge branch master into security-updatesorigin/security-updatesgitlab.intr/security-updates

This merge mostly take the changes made to the master branch.

Some conflict happen in top-level/default.nix due to a reformating of the
code of which is computing the fix-point. This merge fixes these issues by
adding the pkgsIndex argument, needed to re-evaluate the fix-point with
another set of packages, and also re-add the second fix-point made to
support the dependencies.

1 files changed, 5 insertions, 8 deletions

diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
index b653c705478d..18933426db0a 100644
--- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
+++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl, python, pkgconfig, libxml2Python, libxslt, intltool
-, makeWrapper, pythonPackages }:
+{stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool
+, makeWrapper, python2Packages }:
 
-stdenv.mkDerivation {
+python2Packages.mkPythonDerivation {
   name = "gnome-doc-utils-0.20.10";
 
   src = fetchurl {
@@ -10,9 +10,6 @@ stdenv.mkDerivation {
   };
 
   configureFlags = "--disable-scrollkeeper";
-  buildInputs = [ python libxml2Python libxslt ];
-  pythonPath = [ libxml2Python ];
-  postInstall = "wrapPythonPrograms";
-
-  nativeBuildInputs = [ pkgconfig intltool pythonPackages.wrapPython ];
+  buildInputs = [ libxslt pkgconfig intltool ];
+  propagatedBuildInputs = [ libxml2Python ];
 }