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

Merge pull request #4012 from ibeex/master 

added darwin as supported platform for meld
This commit is contained in:
Eelco Dolstra 2014-09-09 15:35:58 +02:00
parent dcb36abbf5 841f45b231
commit 4ae3e32e82
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/version-management/meld/default.nix
View File

@ -28,6 +28,6 @@ stdenv.mkDerivation {
description = "Visual diff and merge tool"; description = "Visual diff and merge tool";
homepage = http://meld.sourceforge.net; homepage = http://meld.sourceforge.net;
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
platforms = platforms.linux; platforms = platforms.linux ++ stdenv.lib.platforms.darwin;
}; };
} }

4
pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
View File

@ -1,4 +1,4 @@
{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 { stdenv.mkDerivation {
name = "scrollkeeper-0.3.14"; name = "scrollkeeper-0.3.14";
@ -13,6 +13,6 @@ stdenv.mkDerivation {
cp ${automake}/share/automake*/config.{sub,guess} . 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"; configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
} }