Merge pull request #11971 from Denommus/master

Adding which and curl as dependencies to playonlinux
2015-12-27 11:04:13 +01:00
parent 3c06503067 9c6fecbda0
commit bd3ef3d1be
2 changed files with 6 additions and 3 deletions
--- 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" ]