From 5cfeedc9147d543b5409f1d19e9303c813200e9d Mon Sep 17 00:00:00 2001 From: Yuri Albuquerque Date: Sun, 27 Dec 2015 00:02:09 -0400 Subject: [PATCH 1/2] fontforge: needs pango on Linux, too --- pkgs/tools/misc/fontforge/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 3ecb886419f..9ee3eb23e0e 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -29,10 +29,9 @@ stdenv.mkDerivation { buildInputs = [ git autoconf automake gnum4 libtool perl pkgconfig gettext uthash python freetype zlib glib libungif libpng libjpeg libtiff libxml2 + pango ] - ++ lib.optionals withGTK [ gtk2 ] - # I'm not sure why pango doesn't seem necessary on Linux - ++ lib.optionals stdenv.isDarwin [ pango ]; + ++ lib.optionals withGTK [ gtk2 ]; configureFlags = lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ] From 9c6fecbda0f713a1394bcfd9054050205133835d Mon Sep 17 00:00:00 2001 From: Yuri Albuquerque Date: Sun, 27 Dec 2015 00:01:58 -0400 Subject: [PATCH 2/2] playonlinux: needs which and curl during runtime --- pkgs/applications/misc/playonlinux/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 731cf5a6ba9..178fc13065b 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -17,6 +17,8 @@ , xterm , pkgs , pkgsi686Linux +, which +, curl }: assert stdenv.isLinux; @@ -39,6 +41,8 @@ let wine xdg-user-dirs xterm + which + curl ]; ld32 =