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

Merge pull request #11971 from Denommus/master

Browse Source 
Adding which and curl as dependencies to playonlinux
This commit is contained in:
Domen Kožar 2015-12-27 11:04:13 +01:00
commit bd3ef3d1be
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/playonlinux/default.nix
View File

@ -17,6 +17,8 @@
, xterm , xterm
, pkgs , pkgs
, pkgsi686Linux , pkgsi686Linux
, which
, curl
}: }:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -39,6 +41,8 @@ let
wine wine
xdg-user-dirs xdg-user-dirs
xterm xterm
which
curl
]; ];
ld32 = ld32 =

5
pkgs/tools/misc/fontforge/default.nix
View File

@ -29,10 +29,9 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
git autoconf automake gnum4 libtool perl pkgconfig gettext uthash git autoconf automake gnum4 libtool perl pkgconfig gettext uthash
python freetype zlib glib libungif libpng libjpeg libtiff libxml2 python freetype zlib glib libungif libpng libjpeg libtiff libxml2
pango
] ]
++ lib.optionals withGTK [ gtk2 ] ++ lib.optionals withGTK [ gtk2 ];
# I'm not sure why pango doesn't seem necessary on Linux
++ lib.optionals stdenv.isDarwin [ pango ];
configureFlags = configureFlags =
lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ] lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ]