From ea35aa383680d4da69c4cde37d0c381aa839531b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 1 Sep 2010 08:36:35 +0000 Subject: [PATCH] Making scrollkeeper build in the loongson (config.guess trouble) svn path=/nixpkgs/branches/stdenv-updates/; revision=23580 --- pkgs/desktops/gnome-2.28/default.nix | 2 +- pkgs/desktops/gnome-2.28/desktop/scrollkeeper/default.nix | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 1c358b591a6..e6ee85ff6e1 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -227,7 +227,7 @@ rec { # Removed from recent GNOME releases, but still required scrollkeeper = import ./desktop/scrollkeeper { - inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42; + inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42 automake; }; gnome_doc_utils = import ./desktop/gnome-doc-utils { diff --git a/pkgs/desktops/gnome-2.28/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2.28/desktop/scrollkeeper/default.nix index a63d179ff94..97dcbf4e004 100644 --- a/pkgs/desktops/gnome-2.28/desktop/scrollkeeper/default.nix +++ b/pkgs/desktops/gnome-2.28/desktop/scrollkeeper/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}: +{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, automake}: stdenv.mkDerivation { name = "scrollkeeper-0.3.14"; @@ -6,9 +6,13 @@ stdenv.mkDerivation { url = mirror://gnome/sources/scrollkeeper/0.3/scrollkeeper-0.3.14.tar.bz2; sha256 = "08n1xgj1f53zahwm0wpn3jid3rfbhi3iwby0ilaaldnid5qriqgc"; }; + + # The fuloong2f is not supported by scrollkeeper-0.3.14 config.guess preConfigure = " substituteInPlace extract/dtds/Makefile.am --replace /usr/bin/xmlcatalog xmlcatalog + cp ${automake}/share/automake*/config.{sub,guess} . "; + buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; }