diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-08-03 10:45:13 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-08-03 10:45:13 +0200 |
commit | 98f37166505f3559f53bef238cebc5a69fe00201 (patch) | |
tree | 782f4e25acde2ec85edb8c3bc21bfaf263f1a852 /pkgs/development | |
parent | d374527509657cfeb8499118b26e7605fab8f4d2 (diff) |
clean some include flags that weren't really needed
Tested the builds still work (x86_64-linux).
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/swi-prolog/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/glib/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/pango/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/pangomm/2.28.x.nix | 2 |
5 files changed, 7 insertions, 15 deletions
diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index a17e104b5bbfd..e8db962d9c4fe 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 a09903f7ea91b..22e1ca0d6e4c9 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 6c53e573bf669..b2c5966c26797 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 <glib/...> + # Some packages don't get "Cflags" from pkgconfig correctly + # and then fail to build when directly including like <glib/...>. + # 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 cec3d1dccc00e..b1faa6c30f62c 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 d03aa4311fe01..6843ff7a3072d 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/; |