From 841f45b2317489a78e71d36fa593e33d778b765e Mon Sep 17 00:00:00 2001 From: Ivan Brkanac Date: Tue, 9 Sep 2014 15:21:04 +0200 Subject: [PATCH] added darwin ass supported platform for meld, added get text as requirement for scroollkeeper --- pkgs/applications/version-management/meld/default.nix | 2 +- pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 951ea29a7fc..145496cb49c 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { 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; }; } diff --git a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix index 97dcbf4e004..3da878dde74 100644 --- a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix +++ b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix @@ -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 { name = "scrollkeeper-0.3.14"; @@ -13,6 +13,6 @@ stdenv.mkDerivation { 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"; }