diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-01-21 13:17:18 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-01-21 13:17:18 +0000 |
commit | 50405c5948b5f88475880c94ad02260b6b8554b6 (patch) | |
tree | 870f9cc4f6a13b2e1367842deb1fbaef821a1afc | |
parent | 823b3e4770f6f95468a15e9887be76e0535100a3 (diff) |
* Obscure bug: Zapping needs gettext, otherwise the Automake variable
DATADIRNAME is not set. svn path=/nixpkgs/trunk/; revision=682
-rwxr-xr-x | pkgs/applications/video/zapping/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/applications/video/zapping/default.nix | 7 | ||||
-rw-r--r-- | pkgs/system/all-packages-generic.nix | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/video/zapping/builder.sh b/pkgs/applications/video/zapping/builder.sh index 024ad12c4407e..69ae4cfb2f400 100755 --- a/pkgs/applications/video/zapping/builder.sh +++ b/pkgs/applications/video/zapping/builder.sh @@ -1,7 +1,7 @@ #! /bin/sh buildinputs="$pkgconfig $perl $python $x11 $libgnomeui \ - $libglade $scrollkeeper $esound" + $libglade $scrollkeeper $esound $gettext" . $stdenv/setup || exit 1 # !!! hack; this is because $linuxHeaders/config.h includes some diff --git a/pkgs/applications/video/zapping/default.nix b/pkgs/applications/video/zapping/default.nix index caaabe20519e8..49f75732e87e1 100644 --- a/pkgs/applications/video/zapping/default.nix +++ b/pkgs/applications/video/zapping/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, perl, python, x11, libgnomeui -, libglade, scrollkeeper, esound }: +, libglade, scrollkeeper, esound, gettext }: assert !isNull pkgconfig && !isNull perl && !isNull python && !isNull x11 && !isNull libgnomeui && !isNull libglade && - !isNull scrollkeeper && !isNull esound; + !isNull scrollkeeper && !isNull esound && !isNull gettext; # !!! zvbi library # !!! arts, jpeg, png, rte derivation { - name = "zapping-0.6.8"; + name = "zapping-0.7cvs6"; system = stdenv.system; builder = ./builder.sh; @@ -27,4 +27,5 @@ derivation { libglade = libglade; scrollkeeper = scrollkeeper; esound = esound; + gettext = gettext; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 31ff3c21e0430..a2ccf0c42f354 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -751,6 +751,7 @@ libglade = libglade; scrollkeeper = scrollkeeper; esound = esound; + gettext = gettext; }; gqview = (import ../applications/graphics/gqview) { |