Merge pull request #11971 from Denommus/master

Adding which and curl as dependencies to playonlinux

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 =

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" ]