3
0
Fork 0
forked from mirrors/nixpkgs

treewide: Make explicit that 'dev' output of freetype is used

This commit is contained in:
Tuomas Tynkkynen 2016-04-16 19:52:29 +03:00 committed by Vladimír Čunát
parent b51b458aed
commit 288912c2c4
11 changed files with 11 additions and 11 deletions

View file

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DUSE_PAM=1" ];
NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype -std=c++11";
NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype -std=c++11";
enableParallelBuilding = true;

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation {
];
preConfigure = ''
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2";
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2";
'';
src = fetchurl {

View file

@ -35,7 +35,7 @@ stdenv.mkDerivation (rec {
mkdir -p $terminfo/share/terminfo
configureFlags="--with-terminfo=$terminfo/share/terminfo --enable-256-color ${if perlSupport then "--enable-perl" else "--disable-perl"} ${if unicode3Support then "--enable-unicode3" else "--disable-unicode3"}";
export TERMINFO=$terminfo/share/terminfo # without this the terminfo won't be compiled by tic, see man tic
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2"
NIX_LDFLAGS="$NIX_LDFLAGS -lfontconfig -lXrender "
''
# make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically

View file

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
MYSQL_DIR=mariadb;
# work around broken build system
NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2";
prePatch = ''
substituteInPlace hphp/util/generate-buildinfo.sh \

View file

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = ''
-I${SDL}/include/SDL
-I${freetype}include/freetype2
-I${freetype.dev}include/freetype2
'';
meta = {

View file

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = ''
-I${SDL.dev}/include/SDL
-I${freetype}include/freetype2
-I${freetype.dev}include/freetype2
'';
meta = {

View file

@ -133,7 +133,7 @@ let
# FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
configureFlags = [
"--with-gd"
"--with-freetype-dir=${freetype}"
"--with-freetype-dir=${freetype.dev}"
"--with-png-dir=${libpng}"
"--with-jpeg-dir=${libjpeg}"
];

View file

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
# https://bugs.freedesktop.org/show_bug.cgi?id=83631
+ " -DGLX_GLXEXT_LEGACY";
configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ];
configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype.dev}" ];
postInstall = ''
mv $out/inc $out/include

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
preUnpack = ''
sourceRoot=`pwd`/ros/adm/cmake
cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype}"
cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype.dev}"
'';
# https://bugs.freedesktop.org/show_bug.cgi?id=83631

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [pkgconfig freetype libXft pango fontconfig];
NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2";
meta = {
description = "An advanced font engine";

View file

@ -13,7 +13,7 @@ stdenv.mkDerivation {
mkdir -p $out
sed -e 's/chown/true/' \
-e 's/chgrp/true/' \
-e 's@^CFLAGS_FT =.*@CFLAGS_FT=-DUSE_FREETYPE -I${freetype}/include/freetype2@' \
-e 's@^CFLAGS_FT =.*@CFLAGS_FT=-DUSE_FREETYPE -I${freetype.dev}/include/freetype2@' \
-i scripts/{inst_dir,inst_file} Makefile
makeFlags="INSTDIR=$out OWNER=`id -u`"
'';