* Obscure bug: Zapping needs gettext, otherwise the Automake variable

DATADIRNAME is not set.

svn path=/nixpkgs/trunk/; revision=682
This commit is contained in:
Eelco Dolstra 2004-01-21 13:17:18 +00:00
parent 823b3e4770
commit 50405c5948
3 changed files with 6 additions and 4 deletions

View File

@ -1,7 +1,7 @@
#! /bin/sh #! /bin/sh
buildinputs="$pkgconfig $perl $python $x11 $libgnomeui \ buildinputs="$pkgconfig $perl $python $x11 $libgnomeui \
$libglade $scrollkeeper $esound" $libglade $scrollkeeper $esound $gettext"
. $stdenv/setup || exit 1 . $stdenv/setup || exit 1
# !!! hack; this is because $linuxHeaders/config.h includes some # !!! hack; this is because $linuxHeaders/config.h includes some

View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, perl, python, x11, libgnomeui { stdenv, fetchurl, pkgconfig, perl, python, x11, libgnomeui
, libglade, scrollkeeper, esound }: , libglade, scrollkeeper, esound, gettext }:
assert !isNull pkgconfig && !isNull perl && !isNull python && assert !isNull pkgconfig && !isNull perl && !isNull python &&
!isNull x11 && !isNull libgnomeui && !isNull libglade && !isNull x11 && !isNull libgnomeui && !isNull libglade &&
!isNull scrollkeeper && !isNull esound; !isNull scrollkeeper && !isNull esound && !isNull gettext;
# !!! zvbi library # !!! zvbi library
# !!! arts, jpeg, png, rte # !!! arts, jpeg, png, rte
derivation { derivation {
name = "zapping-0.6.8"; name = "zapping-0.7cvs6";
system = stdenv.system; system = stdenv.system;
builder = ./builder.sh; builder = ./builder.sh;
@ -27,4 +27,5 @@ derivation {
libglade = libglade; libglade = libglade;
scrollkeeper = scrollkeeper; scrollkeeper = scrollkeeper;
esound = esound; esound = esound;
gettext = gettext;
} }

View File

@ -751,6 +751,7 @@
libglade = libglade; libglade = libglade;
scrollkeeper = scrollkeeper; scrollkeeper = scrollkeeper;
esound = esound; esound = esound;
gettext = gettext;
}; };
gqview = (import ../applications/graphics/gqview) { gqview = (import ../applications/graphics/gqview) {