From 74a7f5122e0285abc9dc32fb69dd24509be4286b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org> Date: Wed, 8 Jun 2011 12:04:47 +0000 Subject: [PATCH] FreeType: Add dependency on GNU Make on FreeBSD. svn path=/nixpkgs/trunk/; revision=27397 --- pkgs/development/libraries/freetype/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 7c630fd026ed..895d2585b674 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, gnumake , # FreeType supports sub-pixel rendering. This is patented by # Microsoft, so it is disabled by default. This option allows it to # be enabled. See http://www.freetype.org/patents.html. useEncumberedCode ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "freetype-2.4.4"; src = fetchurl { @@ -26,4 +26,11 @@ stdenv.mkDerivation rec { homepage = http://www.freetype.org/; license = "GPLv2+"; # or the FreeType License (BSD + advertising clause) }; -} \ No newline at end of file +} + +// + +# FreeType requires GNU Make, which is not part of stdenv on FreeBSD. +(if stdenv.system == "i686-freebsd" + then { buildInputs = [ gnumake ]; } + else {}))