From 288912c2c44279e91bca635c5a99cced5347fbd0 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 19:52:29 +0300 Subject: [PATCH] treewide: Make explicit that 'dev' output of freetype is used --- pkgs/applications/display-managers/slim/default.nix | 2 +- pkgs/applications/misc/mrxvt/default.nix | 2 +- pkgs/applications/misc/rxvt_unicode/default.nix | 2 +- pkgs/development/compilers/hhvm/default.nix | 2 +- pkgs/development/interpreters/love/0.7.nix | 2 +- pkgs/development/interpreters/love/0.8.nix | 2 +- pkgs/development/interpreters/php/default.nix | 2 +- pkgs/development/libraries/opencascade/6.5.nix | 2 +- pkgs/development/libraries/opencascade/default.nix | 2 +- pkgs/development/libraries/silgraphite/default.nix | 2 +- pkgs/tools/misc/ttf2pt1/default.nix | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index c77102629885..fca84199e511 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -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; diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix index b11b234eb43d..e8bf2f7a14c8 100644 --- a/pkgs/applications/misc/mrxvt/default.nix +++ b/pkgs/applications/misc/mrxvt/default.nix @@ -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 { diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 5d1eda5ec063..8fbe021cc8f7 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -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 diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 23f0484e8ead..eb9e5f7d3627 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -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 \ diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 65f38ae1613d..76b08cd35c60 100644 --- a/pkgs/development/interpreters/love/0.7.nix +++ b/pkgs/development/interpreters/love/0.7.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = '' -I${SDL}/include/SDL - -I${freetype}include/freetype2 + -I${freetype.dev}include/freetype2 ''; meta = { diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix index b12c2c405780..e73f831156a5 100644 --- a/pkgs/development/interpreters/love/0.8.nix +++ b/pkgs/development/interpreters/love/0.8.nix @@ -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 = { diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 257329b881ec..d258823b868a 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -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}" ]; diff --git a/pkgs/development/libraries/opencascade/6.5.nix b/pkgs/development/libraries/opencascade/6.5.nix index 4228c285dfd5..904137c4d8cc 100644 --- a/pkgs/development/libraries/opencascade/6.5.nix +++ b/pkgs/development/libraries/opencascade/6.5.nix @@ -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 diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index ec15d9d631e6..536281d53725 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -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 diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix index 8e8cdc0ce1cf..f124b313d74c 100644 --- a/pkgs/development/libraries/silgraphite/default.nix +++ b/pkgs/development/libraries/silgraphite/default.nix @@ -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"; diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix index 5a03e0995393..da0c966eb5e1 100644 --- a/pkgs/tools/misc/ttf2pt1/default.nix +++ b/pkgs/tools/misc/ttf2pt1/default.nix @@ -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`" '';