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

clean some include flags that weren't really needed

Browse Source 
Tested the builds still work (x86_64-linux).
This commit is contained in:
Vladimír Čunát 2013-08-03 10:45:13 +02:00
parent d374527509
commit 98f3716650
7 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/swi-prolog/default.nix
View File

@ -18,10 +18,6 @@ stdenv.mkDerivation {
configureFlags = "--with-world --enable-gmp --enable-shared"; configureFlags = "--with-world --enable-gmp --enable-shared";
makeFlags = "world"; makeFlags = "world";
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"
'';
meta = { meta = {
homepage = http://www.swi-prolog.org/; homepage = http://www.swi-prolog.org/;
description = "A Prolog compiler and interpreter"; description = "A Prolog compiler and interpreter";

2
pkgs/development/libraries/cairo/default.nix
View File

@ -34,8 +34,6 @@ stdenv.mkDerivation rec {
++ optional pdfSupport "--enable-pdf" ++ optional pdfSupport "--enable-pdf"
; ;
NIX_CFLAGS_COMPILE = "-I${pixman}/include/pixman-1";
preConfigure = preConfigure =
# On FreeBSD, `-ldl' doesn't exist. # On FreeBSD, `-ldl' doesn't exist.
(stdenv.lib.optionalString stdenv.isFreeBSD (stdenv.lib.optionalString stdenv.isFreeBSD

12
pkgs/development/libraries/glib/default.nix
View File

@ -12,15 +12,17 @@
# $out/bin/gtester-report' to postInstall if this is solved # $out/bin/gtester-report' to postInstall if this is solved
let let
# some packages don't get "Cflags" from pkgconfig correctly # Some packages don't get "Cflags" from pkgconfig correctly
# and then fail to build when directly including like <glib/...> # 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 = '' flattenInclude = ''
for dir in $out/include/*; do for dir in "$out"/include/*; do
cp -r $dir/* "$out/include/" cp -r "$dir"/* "$out/include/"
rm -r "$dir" rm -r "$dir"
ln -s . "$dir" ln -s . "$dir"
done 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 in
with { inherit (stdenv.lib) optionalString; }; with { inherit (stdenv.lib) optionalString; };

2
pkgs/development/libraries/pango/default.nix
View File

@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx"; sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx";
}; };
NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

2
pkgs/development/libraries/pangomm/2.28.x.nix
View File

@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ pango glibmm cairomm libpng cairo ]; propagatedBuildInputs = [ pango glibmm cairomm libpng cairo ];
NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "C++ interface to the Pango text rendering library"; description = "C++ interface to the Pango text rendering library";
homepage = http://www.pango.org/; homepage = http://www.pango.org/;

2
pkgs/tools/graphics/gnuplot/default.nix
View File

@ -32,8 +32,6 @@ stdenv.mkDerivation rec {
configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"]; configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"];
NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo";
postInstall = stdenv.lib.optionalString (libX11 != null) '' postInstall = stdenv.lib.optionalString (libX11 != null) ''
wrapProgram $out/bin/gnuplot \ wrapProgram $out/bin/gnuplot \
--prefix PATH : '${gnused}/bin' \ --prefix PATH : '${gnused}/bin' \

1
pkgs/tools/typesetting/tex/texlive/default.nix
View File

@ -35,7 +35,6 @@ rec {
sed -e s@ncurses/curses.h@curses.h@g -i $(grep ncurses/curses.h -rl . ) sed -e s@ncurses/curses.h@curses.h@g -i $(grep ncurses/curses.h -rl . )
sed -e '1i\#include <string.h>\n\#include <stdlib.h>' -i $( find libs/teckit -name '*.cpp' -o -name '*.c' ) sed -e '1i\#include <string.h>\n\#include <stdlib.h>' -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"; NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout";
./Build --prefix="$out" --datadir="$out/share" --mandir "$out/share/man" --infodir "$out/share/info" \ ./Build --prefix="$out" --datadir="$out/share" --mandir "$out/share/man" --infodir "$out/share/info" \