diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2008-03-10 15:05:32 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2008-03-10 15:05:32 +0000 |
| commit | d35b3240fd8cc5986dbd5089082eff15174d925e (patch) | |
| tree | 24e4567984eb7e7b0094ca01e75f19f14951c5ba /pkgs | |
| parent | af43b8a02498ff88548f4e9813c298d84607384c (diff) | |
| download | nixlib-d35b3240fd8cc5986dbd5089082eff15174d925e.tar nixlib-d35b3240fd8cc5986dbd5089082eff15174d925e.tar.gz nixlib-d35b3240fd8cc5986dbd5089082eff15174d925e.tar.bz2 nixlib-d35b3240fd8cc5986dbd5089082eff15174d925e.tar.lz nixlib-d35b3240fd8cc5986dbd5089082eff15174d925e.tar.xz nixlib-d35b3240fd8cc5986dbd5089082eff15174d925e.tar.zst nixlib-d35b3240fd8cc5986dbd5089082eff15174d925e.zip | |
Gnash: Add `libXext' to the `RPATH' of `gtk-gnash'.
svn path=/nixpkgs/trunk/; revision=11036
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/video/gnash/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index d83353af4775..05cee5cf1a74 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -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''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47f6950cbb27..4f7750741ba9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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") { |