From 98f37166505f3559f53bef238cebc5a69fe00201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Aug 2013 10:45:13 +0200 Subject: [PATCH] clean some include flags that weren't really needed Tested the builds still work (x86_64-linux). --- pkgs/development/compilers/swi-prolog/default.nix | 4 ---- pkgs/development/libraries/cairo/default.nix | 2 -- pkgs/development/libraries/glib/default.nix | 12 +++++++----- pkgs/development/libraries/pango/default.nix | 2 -- pkgs/development/libraries/pangomm/2.28.x.nix | 2 -- pkgs/tools/graphics/gnuplot/default.nix | 2 -- pkgs/tools/typesetting/tex/texlive/default.nix | 1 - 7 files changed, 7 insertions(+), 18 deletions(-) diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index a17e104b5bbf..e8db962d9c4f 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -18,10 +18,6 @@ stdenv.mkDerivation { configureFlags = "--with-world --enable-gmp --enable-shared"; makeFlags = "world"; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2" - ''; - meta = { homepage = http://www.swi-prolog.org/; description = "A Prolog compiler and interpreter"; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index a09903f7ea91..22e1ca0d6e4c 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -34,8 +34,6 @@ stdenv.mkDerivation rec { ++ optional pdfSupport "--enable-pdf" ; - NIX_CFLAGS_COMPILE = "-I${pixman}/include/pixman-1"; - preConfigure = # On FreeBSD, `-ldl' doesn't exist. (stdenv.lib.optionalString stdenv.isFreeBSD diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 6c53e573bf66..b2c5966c2679 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -12,15 +12,17 @@ # $out/bin/gtester-report' to postInstall if this is solved let - # some packages don't get "Cflags" from pkgconfig correctly - # and then fail to build when directly including like + # Some packages don't get "Cflags" from pkgconfig correctly + # and then fail to build when directly including like . + # This is intended to be run in postInstall of any package + # which has $out/include/ containing just some disjunct directories. flattenInclude = '' - for dir in $out/include/*; do - cp -r $dir/* "$out/include/" + for dir in "$out"/include/*; do + cp -r "$dir"/* "$out/include/" rm -r "$dir" ln -s . "$dir" done - ln -sr -t "$out/include/" $out/lib/*/include/* 2>/dev/null || true + ln -sr -t "$out/include/" "$out"/lib/*/include/* 2>/dev/null || true ''; in with { inherit (stdenv.lib) optionalString; }; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index cec3d1dccc00..b1faa6c30f62 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx"; }; - NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix index d03aa4311fe0..6843ff7a3072 100644 --- a/pkgs/development/libraries/pangomm/2.28.x.nix +++ b/pkgs/development/libraries/pangomm/2.28.x.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pango glibmm cairomm libpng cairo ]; - NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"; - meta = with stdenv.lib; { description = "C++ interface to the Pango text rendering library"; homepage = http://www.pango.org/; diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 5dee1079ae27..23d57f5b6521 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"]; - NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"; - postInstall = stdenv.lib.optionalString (libX11 != null) '' wrapProgram $out/bin/gnuplot \ --prefix PATH : '${gnused}/bin' \ diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index aac8da784b3d..7f512bade8a3 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -35,7 +35,6 @@ rec { sed -e s@ncurses/curses.h@curses.h@g -i $(grep ncurses/curses.h -rl . ) sed -e '1i\#include \n\#include ' -i $( find libs/teckit -name '*.cpp' -o -name '*.c' ) - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2" NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout"; ./Build --prefix="$out" --datadir="$out/share" --mandir "$out/share/man" --infodir "$out/share/info" \