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

authored by Tuomas Tynkkynen and committed by Vladimír Čunát 288912c2 b51b458a

+11 -11
+1 -1
pkgs/applications/display-managers/slim/default.nix
··· 28 28 29 29 cmakeFlags = [ "-DUSE_PAM=1" ]; 30 30 31 - NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype -std=c++11"; 31 + NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype -std=c++11"; 32 32 33 33 enableParallelBuilding = true; 34 34
+1 -1
pkgs/applications/misc/mrxvt/default.nix
··· 19 19 ]; 20 20 21 21 preConfigure = '' 22 - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"; 22 + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2"; 23 23 ''; 24 24 25 25 src = fetchurl {
+1 -1
pkgs/applications/misc/rxvt_unicode/default.nix
··· 35 35 mkdir -p $terminfo/share/terminfo 36 36 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"}"; 37 37 export TERMINFO=$terminfo/share/terminfo # without this the terminfo won't be compiled by tic, see man tic 38 - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2" 38 + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2" 39 39 NIX_LDFLAGS="$NIX_LDFLAGS -lfontconfig -lXrender " 40 40 '' 41 41 # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically
+1 -1
pkgs/development/compilers/hhvm/default.nix
··· 33 33 MYSQL_DIR=mariadb; 34 34 35 35 # work around broken build system 36 - NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; 36 + NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2"; 37 37 38 38 prePatch = '' 39 39 substituteInPlace hphp/util/generate-buildinfo.sh \
+1 -1
pkgs/development/interpreters/love/0.7.nix
··· 37 37 38 38 NIX_CFLAGS_COMPILE = '' 39 39 -I${SDL}/include/SDL 40 - -I${freetype}include/freetype2 40 + -I${freetype.dev}include/freetype2 41 41 ''; 42 42 43 43 meta = {
+1 -1
pkgs/development/interpreters/love/0.8.nix
··· 37 37 38 38 NIX_CFLAGS_COMPILE = '' 39 39 -I${SDL.dev}/include/SDL 40 - -I${freetype}include/freetype2 40 + -I${freetype.dev}include/freetype2 41 41 ''; 42 42 43 43 meta = {
+1 -1
pkgs/development/interpreters/php/default.nix
··· 133 133 # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108. 134 134 configureFlags = [ 135 135 "--with-gd" 136 - "--with-freetype-dir=${freetype}" 136 + "--with-freetype-dir=${freetype.dev}" 137 137 "--with-png-dir=${libpng}" 138 138 "--with-jpeg-dir=${libjpeg}" 139 139 ];
+1 -1
pkgs/development/libraries/opencascade/6.5.nix
··· 26 26 # https://bugs.freedesktop.org/show_bug.cgi?id=83631 27 27 + " -DGLX_GLXEXT_LEGACY"; 28 28 29 - configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ]; 29 + configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype.dev}" ]; 30 30 31 31 postInstall = '' 32 32 mv $out/inc $out/include
+1 -1
pkgs/development/libraries/opencascade/default.nix
··· 11 11 12 12 preUnpack = '' 13 13 sourceRoot=`pwd`/ros/adm/cmake 14 - cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype}" 14 + cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype.dev}" 15 15 ''; 16 16 17 17 # https://bugs.freedesktop.org/show_bug.cgi?id=83631
+1 -1
pkgs/development/libraries/silgraphite/default.nix
··· 11 11 12 12 buildInputs = [pkgconfig freetype libXft pango fontconfig]; 13 13 14 - NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; 14 + NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2"; 15 15 16 16 meta = { 17 17 description = "An advanced font engine";
+1 -1
pkgs/tools/misc/ttf2pt1/default.nix
··· 13 13 mkdir -p $out 14 14 sed -e 's/chown/true/' \ 15 15 -e 's/chgrp/true/' \ 16 - -e 's@^CFLAGS_FT =.*@CFLAGS_FT=-DUSE_FREETYPE -I${freetype}/include/freetype2@' \ 16 + -e 's@^CFLAGS_FT =.*@CFLAGS_FT=-DUSE_FREETYPE -I${freetype.dev}/include/freetype2@' \ 17 17 -i scripts/{inst_dir,inst_file} Makefile 18 18 makeFlags="INSTDIR=$out OWNER=`id -u`" 19 19 '';