From 865b21548f19362d2297d5a16b9bba57af1a6bc7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 10 Mar 2018 13:01:01 +0100 Subject: [PATCH] Revert "Merge pull request #36743 from xeji/gtkdoc" This reverts commit bb38918fda8f42c7e0112aca156f0da5dd7a13ad, reversing changes made to 83ee88e70fee515f436d5fa248a15a3b166be7d3. This change should go to staging instead. --- pkgs/development/tools/documentation/gtk-doc/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 5414abff66a..6e7b45b97f6 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,10 +1,6 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which , docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool }: -let - pythonEnv = python.withPackages (ps: with ps; [ six ]); -in - stdenv.mkDerivation rec { name = "gtk-doc-${version}"; version = "1.27"; @@ -22,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = - [ pkgconfig perl pythonEnv libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl + [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl gnome-doc-utils dblatex gettext which itstool ];