JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gnash: Add libXext' to the RPATH' of `gtk-gnash'.

Browse Source 
svn path=/nixpkgs/trunk/; revision=11036
This commit is contained in:
Ludovic Courtès 2008-03-10 15:05:32 +00:00
parent af43b8a024
commit d35b3240fd
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/video/gnash/default.nix
View File

@ -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'';

3
pkgs/top-level/all-packages.nix
View File

@ -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") {