diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-27 01:14:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-27 01:14:09 +0200 |
| commit | fb59f27a4368b1436518f9f76c6e2e68f60b92a6 (patch) | |
| tree | a68c3ac03a7ea04fd4b756a9d3cabf2667896e62 /pkgs/development/libraries/freetype | |
| parent | 4dccb224c584194e964b5fbef5fe2cee28c57803 (diff) | |
| download | nixlib-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.tar nixlib-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.tar.gz nixlib-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.tar.bz2 nixlib-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.tar.lz nixlib-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.tar.xz nixlib-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.tar.zst nixlib-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.zip | |
WIP: getting good
Diffstat (limited to 'pkgs/development/libraries/freetype')
| -rw-r--r-- | pkgs/development/libraries/freetype/default.nix | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 1df9e46c0f70..aa20a6997867 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -23,10 +23,6 @@ stdenv.mkDerivation rec { sha256 = "0pppcn73b5pwd7zdi9yfx16f5i93y18q7q4jmlkwmwrfsllqp160"; }; - outputs = [ "dev" "out" ]; - - configureFlags = "--disable-static --bindir=$(dev)/bin"; - patches = [ ./enable-validation.patch ] # from Gentoo ++ [ (fetch_bohoomil "freetype-2.5.3-pkgconfig.patch" "1dpfdh8kmka3gzv14glz7l79i545zizah6wma937574v5z2iy3nn") @@ -36,12 +32,16 @@ stdenv.mkDerivation rec { (fetch_bohoomil "infinality-2.5.3.patch" "0mxiybcb4wwbicrjiinh1b95rv543bh05sdqk1v0ipr3fxfrb47q") ; + outputs = [ "dev" "out" ]; + propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence - buildInputs = [ pkgconfig which ] + buildInputs = [ stdenv.hookLib.multiout pkgconfig which ] # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. ++ optional (!stdenv.isLinux) gnumake; + configureFlags = "--disable-static --bindir=$(dev)/bin"; + # from Gentoo, see https://bugzilla.redhat.com/show_bug.cgi?id=506840 NIX_CFLAGS_COMPILE = "-fno-strict-aliasing"; # The asm for armel is written with the 'asm' keyword. @@ -52,12 +52,8 @@ stdenv.mkDerivation rec { doCheck = true; # compat hacks - postInstall = glib.flattenInclude + '' - ln -s . "$out"/include/freetype - - mkdir $dev/lib - mv $out/lib/pkgconfig $dev/lib/ - ln -s freetype2/freetype $dev/include/freetype + postFixup = glib.flattenInclude + '' + ln -s . "$dev"/include/freetype ''; crossAttrs = { |