ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 12:38:41 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/display-managers/slim/default.nix
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;

2
pkgs/applications/misc/mrxvt/default.nix
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 {

2
pkgs/applications/misc/rxvt_unicode/default.nix
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

2
pkgs/development/compilers/hhvm/default.nix
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 \

2
pkgs/development/interpreters/love/0.7.nix
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 = {

2
pkgs/development/interpreters/love/0.8.nix
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 = {

2
pkgs/development/interpreters/php/default.nix
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}"
];

2
pkgs/development/libraries/opencascade/6.5.nix
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

2
pkgs/development/libraries/opencascade/default.nix
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

2
pkgs/development/libraries/silgraphite/default.nix
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";

2
pkgs/tools/misc/ttf2pt1/default.nix
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`"
'';