Author: ludo
Date: Wed Jun 8 12:04:47 2011
New Revision: 27397
URL: https://svn.nixos.org/websvn/nix/?rev=27397&sc=1
Log:
FreeType: Add dependency on GNU Make on FreeBSD.
Modified:
nixpkgs/trunk/pkgs/development/libraries/freetype/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/freetype/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/freetype/default.nix Wed Jun
8 11:15:27 2011 (r27396)
+++ nixpkgs/trunk/pkgs/development/libraries/freetype/default.nix Wed Jun
8 12:04:47 2011 (r27397)
@@ -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 @@
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 {}))
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
