alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

GNU Gnash: Depend on Libtool.

Browse source 
This (1) allows Gnash to be linked against the available `libltdl' rather
than its own, and (2) it prevents `libtld.h' to be installed (which was the
case when Gnash's own libltdl was used), thereby avoiding a collision with
Libtool.

svn path=/nixpkgs/trunk/; revision=12292
This commit is contained in:
Ludovic Courtès 2008-07-06 21:46:33 +00:00
parent 4987da9c2b
commit 834144b5d3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/video/gnash/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl { stdenv, fetchurl
, SDL, SDL_mixer, GStreamer , SDL, SDL_mixer, GStreamer
, libogg, libxml2, libjpeg, mesa, libpng , libogg, libxml2, libjpeg, mesa, libpng, libtool
, boost, freetype, agg, dbus, curl, pkgconfig , boost, freetype, agg, dbus, curl, pkgconfig
, glib, gtk, x11 , glib, gtk, x11
, lib}: , lib}:
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
# XXX: KDE is supported as well so we could make it available optionally. # XXX: KDE is supported as well so we could make it available optionally.
buildInputs = [x11 SDL SDL_mixer GStreamer buildInputs = [x11 SDL SDL_mixer GStreamer libtool
libogg libxml2 libjpeg mesa libpng boost freetype agg libogg libxml2 libjpeg mesa libpng boost freetype agg
dbus curl pkgconfig glib gtk]; dbus curl pkgconfig glib gtk];
inherit SDL_mixer SDL; inherit SDL_mixer SDL;

2
pkgs/top-level/all-packages.nix
View file

@ -5946,7 +5946,7 @@ let pkgs = rec {
gnash = assert mesaSupported; import ../applications/video/gnash { gnash = assert mesaSupported; import ../applications/video/gnash {
inherit fetchurl stdenv SDL SDL_mixer libogg libxml2 libjpeg mesa libpng inherit fetchurl stdenv SDL SDL_mixer libogg libxml2 libjpeg mesa libpng
boost freetype agg dbus curl pkgconfig x11 lib; boost freetype agg dbus curl pkgconfig x11 libtool lib;
inherit (gtkLibs) glib gtk; inherit (gtkLibs) glib gtk;
GStreamer = gst_all.gstreamer; GStreamer = gst_all.gstreamer;
}; };