* Let GUI applications/libraries link against the nixified XFree86.

This makes the system package fully nixified in the sense that

    for i in $(nix -qn $(fix system/system-template-everything.fix))/bin/*; \
    do echo $i; ldd $i; done

  shows that the programs in the system package only link against libraries in
  the Nix store.

  (Some builders still use header files from /usr/X11/include, though.)

svn path=/nixpkgs/trunk/; revision=376
This commit is contained in:
Eelco Dolstra 2003-08-29 14:43:45 +00:00
parent d60e11c4e2
commit eef0deb633
13 changed files with 19 additions and 12 deletions

View file

@ -1,12 +1,13 @@
#! /bin/sh
envpkgs="$freetype"
envpkgs="$freetype $x11"
. $stdenv/setup || exit 1
tar xvfj $src || exit 1
tar xvfj $fonts || exit 1
cd MPlayer-* || exit 1
./configure --prefix=$out --with-win32libdir=$win32codecs \
--with-x11incdir=$x11/include --with-x11libdir=$x11/lib \
--with-reallibdir=$win32codecs \
--disable-sdl --disable-esd --disable-xanim --disable-cdparanoia --disable-directfb \
--disable-lirc --disable-svga --disable-libdv \

View file

@ -14,6 +14,7 @@ Package(
]))
, ("stdenv", IncludeFix("stdenv/stdenv.fix"))
, ("x11", IncludeFix("xfree86/xfree86.fix"))
, ("freetype", IncludeFix("freetype/freetype.fix"))
, ("win32codecs", IncludeFix("win32codecs/win32codecs.fix"))
]

View file

@ -1,11 +1,11 @@
#! /bin/sh
envpkgs="$fontconfig"
envpkgs="$fontconfig $x11"
. $stdenv/setup || exit 1
tar xvfz $src || exit 1
cd fcpackage*/Xft || exit 1
./configure --prefix=$out --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1
./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1
make || exit 1
make install || exit 1
echo $envpkgs > $out/envpkgs || exit 1

View file

@ -9,6 +9,7 @@ Package(
]))
, ("stdenv", IncludeFix("stdenv/stdenv.fix"))
, ("x11", IncludeFix("xfree86/xfree86.fix"))
, ("fontconfig", IncludeFix("fontconfig/fontconfig.fix"))
]
)

View file

@ -1,6 +1,6 @@
#! /bin/sh
envpkgs="$freetype $expat"
envpkgs="$freetype $expat $x11"
. $stdenv/setup || exit 1
export PATH=$ed/bin:$PATH
@ -11,7 +11,7 @@ export TZ=UTC
tar xvfz $src || exit 1
cd fcpackage*/fontconfig || exit 1
./configure --prefix=$out --with-confdir=$out/etc/fonts \
--x-includes=/usr/X11/include --x-libraries=/usr/X11/lib \
--x-includes=$x11/include --x-libraries=$x11/lib \
--with-expat-includes=$expat/include --with-expat-lib=$expat/lib || exit 1
make || exit 1
make install || exit 1

View file

@ -9,6 +9,7 @@ Package(
]))
, ("stdenv", IncludeFix("stdenv/stdenv.fix"))
, ("x11", IncludeFix("xfree86/xfree86.fix"))
, ("freetype", IncludeFix("freetype/freetype.fix"))
, ("expat", IncludeFix("expat/expat.fix"))
, ("ed", IncludeFix("ed/ed.fix"))

View file

@ -1,11 +1,11 @@
#! /bin/sh
envpkgs="$glib"
envpkgs="$glib $x11"
. $stdenv/setup || exit 1
tar xvfz $src || 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=$x11/include --x-libraries=$x11/lib || exit 1
make || exit 1
make install || exit 1

View file

@ -9,6 +9,7 @@ Package(
]))
, ("stdenv", IncludeFix("stdenv/stdenv.fix"))
, ("x11", IncludeFix("xfree86/xfree86.fix"))
, ("glib", IncludeFix("glib-1/glib.fix"))
]
)

View file

@ -1,6 +1,6 @@
#! /bin/sh
envpkgs="$glib $atk $pango $tiff $jpeg $png"
envpkgs="$glib $atk $pango $tiff $jpeg $png $x11"
. $stdenv/setup || exit 1
export PATH=$pkgconfig/bin:$perl/bin:$PATH
@ -10,7 +10,7 @@ export NIX_CFLAGS_COMPILE="-I$tiff/include -I$jpeg/include -I$png/include -I$zli
tar xvfj $src || exit 1
cd gtk+-* || exit 1
./configure --prefix=$out --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib \
./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib \
--with-libtiff=$tiff || exit 1
make || exit 1
make install || exit 1

View file

@ -10,6 +10,7 @@ Package(
, ("stdenv", IncludeFix("stdenv/stdenv.fix"))
, ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
, ("x11", IncludeFix("xfree86/xfree86.fix"))
, ("glib", IncludeFix("glib/glib.fix"))
, ("atk", IncludeFix("atk/atk.fix"))
, ("pango", IncludeFix("pango/pango.fix"))

View file

@ -1,6 +1,6 @@
#! /bin/sh
envpkgs="$gtk $gtkspell $gnet $libxml"
envpkgs="$gtk $gnet $libxml"
. $stdenv/setup || exit 1
export PATH=$pkgconfig/bin:$perl/bin:$PATH

View file

@ -1,12 +1,12 @@
#! /bin/sh
envpkgs="$glib $Xft"
envpkgs="$glib $Xft $x11"
. $stdenv/setup || exit 1
export PATH=$pkgconfig/bin:$PATH
tar xvfj $src || exit 1
cd pango-* || exit 1
./configure --prefix=$out --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1
./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1
make || exit 1
make install || exit 1

View file

@ -10,6 +10,7 @@ Package(
, ("stdenv", IncludeFix("stdenv/stdenv.fix"))
, ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix"))
, ("x11", IncludeFix("xfree86/xfree86.fix"))
, ("glib", IncludeFix("glib/glib.fix"))
, ("Xft", IncludeFix("Xft/Xft.fix"))
]