From e730b150764c4253f014d69d30446121f3239f26 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 18 Oct 2016 12:25:20 +0200 Subject: [PATCH] gnome_doc_utils: use python2, rewrite expression --- .../tools/documentation/gnome-doc-utils/default.nix | 13 +++++-------- 1 file 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 b653c705478..18933426db0 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 ]; }