Merge pull request #4012 from ibeex/master

added darwin as supported platform for meld

Changed files
+3 -3
pkgs
applications
version-management
desktops
gnome-2
desktop
scrollkeeper
+1 -1
pkgs/applications/version-management/meld/default.nix
···
description = "Visual diff and merge tool";
homepage = http://meld.sourceforge.net;
license = stdenv.lib.licenses.gpl2Plus;
-
platforms = platforms.linux;
+
platforms = platforms.linux ++ stdenv.lib.platforms.darwin;
};
}
+2 -2
pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
···
-
{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, automake}:
+
{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext}:
stdenv.mkDerivation {
name = "scrollkeeper-0.3.14";
···
cp ${automake}/share/automake*/config.{sub,guess} .
";
-
buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
+
buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt gettext];
configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
}