From 834144b5d374afd7219291e721c92ed0c376ea42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 6 Jul 2008 21:46:33 +0000 Subject: [PATCH] GNU Gnash: Depend on Libtool. 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 --- pkgs/applications/video/gnash/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 4beb8059b72..b7b030ad327 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , SDL, SDL_mixer, GStreamer -, libogg, libxml2, libjpeg, mesa, libpng +, libogg, libxml2, libjpeg, mesa, libpng, libtool , boost, freetype, agg, dbus, curl, pkgconfig , glib, gtk, x11 , lib}: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # 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 dbus curl pkgconfig glib gtk]; inherit SDL_mixer SDL; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53bc5e2c07a..ee0943dbbb5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5946,7 +5946,7 @@ let pkgs = rec { gnash = assert mesaSupported; import ../applications/video/gnash { 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; GStreamer = gst_all.gstreamer; };