mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 15:41:48 +00:00
Gnash: Add libXext' to the
RPATH' of `gtk-gnash'.
svn path=/nixpkgs/trunk/; revision=11036
This commit is contained in:
parent
af43b8a024
commit
d35b3240fd
@ -1,8 +1,8 @@
|
||||
{ stdenv, fetchurl, libX11, libXext, libXi, libXmu
|
||||
{ stdenv, fetchurl
|
||||
, SDL, SDL_mixer, GStreamer
|
||||
, libogg, libxml2, libjpeg, mesa, libpng
|
||||
, boost, freetype, agg, dbus, curl, pkgconfig
|
||||
, glib, gtk
|
||||
, glib, gtk, x11
|
||||
, lib}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -26,11 +26,14 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
# XXX: KDE is supported as well so we could make it available optionally.
|
||||
buildInputs = [libX11 libXext libXi libXmu SDL SDL_mixer GStreamer
|
||||
buildInputs = [x11 SDL SDL_mixer GStreamer
|
||||
libogg libxml2 libjpeg mesa libpng boost freetype agg
|
||||
dbus curl pkgconfig glib gtk];
|
||||
inherit SDL_mixer SDL;
|
||||
|
||||
# Make sure `gtk-gnash' gets `libXext' in its `RPATH'.
|
||||
NIX_LDFLAGS="-lX11 -lXext";
|
||||
|
||||
preInstall = ''ensureDir $out/plugins'';
|
||||
postInstall = ''make install-plugins'';
|
||||
|
||||
|
@ -5112,10 +5112,9 @@ 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 lib;
|
||||
boost freetype agg dbus curl pkgconfig x11 lib;
|
||||
inherit (gtkLibs) glib gtk;
|
||||
GStreamer = gst_all.gstreamer;
|
||||
inherit (xlibs) libX11 libXext libXi libXmu;
|
||||
};
|
||||
|
||||
gocrFun = lib.sumArgs (selectVersion ../applications/graphics/gocr "0.44") {
|
||||
|
Loading…
Reference in New Issue
Block a user