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

* Let gtk use lib{png, tiff, jpeg}.

Browse Source 
* Fix gtkspell.

svn path=/nixpkgs/trunk/; revision=371
This commit is contained in:
Eelco Dolstra 2003-08-28 11:15:48 +00:00
parent 8a2a4aee40
commit d7d58daff4
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/gtk+/gtk+-build.sh
View File

@ -1,12 +1,17 @@
#! /bin/sh #! /bin/sh
envpkgs="$glib $atk $pango" envpkgs="$glib $atk $pango $tiff $jpeg $png"
. $stdenv/setup || exit 1 . $stdenv/setup || exit 1
export PATH=$pkgconfig/bin:$perl/bin:$PATH export PATH=$pkgconfig/bin:$perl/bin:$PATH
# !!! abstraction problem: libtiff optionally needs libjpeg's headers.
# idem for libpng depending on zlib
export NIX_CFLAGS_COMPILE="-I$tiff/include -I$jpeg/include -I$png/include -I$zlib/include $NIX_CFLAGS_COMPILE"
tar xvfj $src || exit 1 tar xvfj $src || exit 1
cd gtk+-* || exit 1 cd gtk+-* || exit 1
./configure --prefix=$out --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1 ./configure --prefix=$out --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib \
--with-libtiff=$tiff || exit 1
make || exit 1 make || exit 1
make install || exit 1 make install || exit 1

4
pkgs/gtk+/gtk+.fix
View File

@ -14,5 +14,9 @@ Package(
, ("atk", IncludeFix("atk/atk.fix")) , ("atk", IncludeFix("atk/atk.fix"))
, ("pango", IncludeFix("pango/pango.fix")) , ("pango", IncludeFix("pango/pango.fix"))
, ("perl", IncludeFix("perl/perl.fix")) , ("perl", IncludeFix("perl/perl.fix"))
, ("tiff", IncludeFix("libtiff/libtiff.fix"))
, ("jpeg", IncludeFix("libjpeg/libjpeg.fix"))
, ("png", IncludeFix("libpng/libpng.fix"))
, ("zlib", IncludeFix("zlib/zlib.fix"))
] ]
) )

3
pkgs/gtkspell/gtkspell-build.sh
View File

@ -3,8 +3,7 @@
envpkgs="$gtk $pspell" envpkgs="$gtk $pspell"
. $stdenv/setup || exit 1 . $stdenv/setup || exit 1
export PATH=$pkgconfig/bin:$PATH export PATH=$pkgconfig/bin:$PATH
export NIX_CFLAGS_COMPILE="-I$pspell/include $NIX_CFLAGS_COMPILE"
export C_INCLUDE_PATH=$pspell/include:$C_INCLUDE_PATH
tar xvfz $src || exit 1 tar xvfz $src || exit 1
cd gtkspell-* || exit 1 cd gtkspell-* || exit 1