From 7c1568645bb8eb7cba5d408eedaffa9982514541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 26 May 2019 10:38:28 +0200 Subject: Revert "gtk-doc: build with meson" This reverts commit 064ca0afe9c9983d6735cf10d28be6c430409cae. The previous gtk-doc version won't build with our current meson. --- .../tools/documentation/gtk-doc/default.nix | 49 +++++----------------- 1 file changed, 11 insertions(+), 38 deletions(-) (limited to 'pkgs/development/tools/documentation') diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index ee2ca64ffebf..91bd12a90a23 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,15 +1,5 @@ -{ stdenv -, fetchFromGitLab -, meson -, ninja -, pkgconfig -, python3 -, libxml2Python -, docbook_xml_dtd_43 -, docbook_xsl -, libxslt -, gettext -, gnome3 +{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python3, libxml2Python, libxslt, which +, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, gettext, itstool, gnome3 , withDblatex ? false, dblatex }: @@ -17,12 +7,9 @@ stdenv.mkDerivation rec { pname = "gtk-doc"; version = "1.30"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = pname; - rev = "GTK_DOC_${stdenv.lib.replaceStrings ["."] ["_"] version }"; - sha256 = "05lr6apj3pd3s59a7k6p45k9ywwrp577ra4pvkhxvb5p7v90c2fi"; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "17h6nwhis66z4dxjrc833wvfl6pqjp81yfx3fq6x7k1qp2749xm4"; }; patches = [ @@ -31,27 +18,13 @@ stdenv.mkDerivation rec { outputDevdoc = "out"; - nativeBuildInputs = [ - gettext - meson - ninja - ]; - - buildInputs = [ - docbook_xml_dtd_43 - docbook_xsl - libxslt - pkgconfig - python3 - libxml2Python - ] - ++ stdenv.lib.optional withDblatex dblatex - ; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = + [ pkgconfig perl python3 libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl + gnome-doc-utils gettext which itstool + ] ++ stdenv.lib.optional withDblatex dblatex; - mesonFlags = [ - "-Dtests=false" - "-Dyelp_manual=false" - ]; + configureFlags = [ "--disable-scrollkeeper" ]; # Make pygments available for binaries, python.withPackages creates a wrapper # but scripts are not allowed in shebangs so we link it into sys.path. -- cgit v1.2.3