Author: viric
Date: Wed Sep 1 08:36:35 2010
New Revision: 23580
URL: https://svn.nixos.org/websvn/nix/?rev=23580&sc=1
Log:
Making scrollkeeper build in the loongson (config.guess trouble)
Modified:
nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/default.nix
nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/desktop/scrollkeeper/default.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/default.nix
Wed Sep 1 08:36:24 2010 (r23579)
+++ nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/default.nix
Wed Sep 1 08:36:35 2010 (r23580)
@@ -227,7 +227,7 @@
# 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 {
Modified:
nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/desktop/scrollkeeper/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/desktop/scrollkeeper/default.nix
Wed Sep 1 08:36:24 2010 (r23579)
+++
nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/desktop/scrollkeeper/default.nix
Wed Sep 1 08:36:35 2010 (r23580)
@@ -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 @@
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";
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
