public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Making scrollkeeper build in the loongson (config.guess trouble)

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23580
This commit is contained in:
Lluís Batlle i Rossell 2010-09-01 08:36:35 +00:00
parent 4b9c06ee6e
commit ea35aa3836
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/gnome-2.28/default.nix
View File

@ -227,7 +227,7 @@ rec {
# Removed from recent GNOME releases, but still required # Removed from recent GNOME releases, but still required
scrollkeeper = import ./desktop/scrollkeeper { 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 { gnome_doc_utils = import ./desktop/gnome-doc-utils {

6
pkgs/desktops/gnome-2.28/desktop/scrollkeeper/default.nix
View File

@ -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 { stdenv.mkDerivation {
name = "scrollkeeper-0.3.14"; name = "scrollkeeper-0.3.14";
@ -6,9 +6,13 @@ stdenv.mkDerivation {
url = mirror://gnome/sources/scrollkeeper/0.3/scrollkeeper-0.3.14.tar.bz2; url = mirror://gnome/sources/scrollkeeper/0.3/scrollkeeper-0.3.14.tar.bz2;
sha256 = "08n1xgj1f53zahwm0wpn3jid3rfbhi3iwby0ilaaldnid5qriqgc"; sha256 = "08n1xgj1f53zahwm0wpn3jid3rfbhi3iwby0ilaaldnid5qriqgc";
}; };
# The fuloong2f is not supported by scrollkeeper-0.3.14 config.guess
preConfigure = " preConfigure = "
substituteInPlace extract/dtds/Makefile.am --replace /usr/bin/xmlcatalog xmlcatalog substituteInPlace extract/dtds/Makefile.am --replace /usr/bin/xmlcatalog xmlcatalog
cp ${automake}/share/automake*/config.{sub,guess} .
"; ";
buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
} }