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

2016-04-16 19:52:29 +03:00
parent b51b458aed
commit 288912c2c4
11 changed files with 11 additions and 11 deletions
--- 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 = {
--- 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 = {
--- 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}"
          ];