diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-03-10 12:49:37 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-03-10 12:49:37 +0000 |
| commit | 8a282aa46c1671252adc0c19ac40d453f743ff7d (patch) | |
| tree | d90e10b042b22de4661a92d0bf436f8d3fc6a180 /pkgs/applications/video | |
| parent | 93e16516a7211cf8123bfc968d9db71163381896 (diff) | |
| download | nixlib-8a282aa46c1671252adc0c19ac40d453f743ff7d.tar nixlib-8a282aa46c1671252adc0c19ac40d453f743ff7d.tar.gz nixlib-8a282aa46c1671252adc0c19ac40d453f743ff7d.tar.bz2 nixlib-8a282aa46c1671252adc0c19ac40d453f743ff7d.tar.lz nixlib-8a282aa46c1671252adc0c19ac40d453f743ff7d.tar.xz nixlib-8a282aa46c1671252adc0c19ac40d453f743ff7d.tar.zst nixlib-8a282aa46c1671252adc0c19ac40d453f743ff7d.zip | |
* Set PERL5LIB automatically in the Perl setup hook.
* Remove explicit setting of PERL5LIB. * Use the generic Perl builder for the BerkeleyDB and XML::Parser modules. * Prefix all names of Perl modules with `perl-' (in the generic Perl builder). svn path=/nixpkgs/trunk/; revision=2365
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/zapping/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/applications/video/zapping/default.nix | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/applications/video/zapping/builder.sh b/pkgs/applications/video/zapping/builder.sh index 6b4790788d39..3114f86eda34 100644 --- a/pkgs/applications/video/zapping/builder.sh +++ b/pkgs/applications/video/zapping/builder.sh @@ -1,7 +1,5 @@ . $stdenv/setup -export PERL5LIB=$perlXMLParser/lib/site_perl:$PERL5LIB - # !!! hack NIX_LDFLAGS="$NIX_LDFLAGS -rpath $libXext/lib" diff --git a/pkgs/applications/video/zapping/default.nix b/pkgs/applications/video/zapping/default.nix index e5e68d6d5575..e704d7ff7ee1 100644 --- a/pkgs/applications/video/zapping/default.nix +++ b/pkgs/applications/video/zapping/default.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation { md5 = "dd7b3d920509709692c41c9c6c767746"; }; - inherit teletextSupport jpegSupport pngSupport libXext perlXMLParser; + inherit teletextSupport jpegSupport pngSupport libXext; buildInputs = [ - pkgconfig perl python x11 libXv libXmu libgnomeui + pkgconfig perl perlXMLParser python x11 libXv libXmu libgnomeui libglade scrollkeeper esound gettext (if teletextSupport then zvbi else null) (if jpegSupport then libjpeg else null) |