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

* xine-ui: put $gcc/lib in the RPATH, because otherwise it will barf

Browse Source 
(on exit) with "libgcc_s.so.1 must be installed for pthread_cancel
  to work".

svn path=/nixpkgs/branches/stdenv-updates/; revision=14980
This commit is contained in:
Eelco Dolstra 2009-04-09 15:27:48 +00:00
parent f5ef461217
commit 977e608a38
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/video/xine-ui/default.nix
View File

@ -1,17 +1,23 @@
args: with args; {stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng, readline, ncurses, curl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "xine-ui-0.99.5"; name = "xine-ui-0.99.5";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/xine/xine-ui-0.99.5.tar.gz; url = mirror://sourceforge/xine/xine-ui-0.99.5.tar.gz;
sha256 = "07jywadk6fhk3wn1j9m0cfa0zy0i17kz0nyyxwa3shvhznfals0k"; sha256 = "07jywadk6fhk3wn1j9m0cfa0zy0i17kz0nyyxwa3shvhznfals0k";
}; };
buildInputs = [
pkgconfig x11 xineLib libpng libXext libXv readline ncurses libXxf86vm buildInputs =
libXtst inputproto curl [ pkgconfig xineLib libpng readline ncurses curl
(if xineLib.xineramaSupport then xineLib.libXinerama else null) xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto
]; ] ++ stdenv.lib.optional xineLib.xineramaSupport xineLib.libXinerama;
configureFlags = "--with-readline=${readline}"; configureFlags = "--with-readline=${readline}";
NIX_LDFLAGS="-L${libXext}/lib -lXext";
NIX_LDFLAGS = "-L${xlibs.libXext}/lib -lXext -rpath ${stdenv.gcc.gcc}/lib";
dontPatchELF = true;
meta = { meta = {
description = "Xlib-based interface to Xine, a video player"; description = "Xlib-based interface to Xine, a video player";

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

@ -9056,8 +9056,7 @@ let
}; };
xineUI = import ../applications/video/xine-ui { xineUI = import ../applications/video/xine-ui {
inherit fetchurl stdenv pkgconfig x11 xineLib libpng readline ncurses curl; inherit fetchurl stdenv pkgconfig xlibs xineLib libpng readline ncurses curl;
inherit (xorg) libXext libXv libXxf86vm libXtst inputproto;
}; };
xmms = import ../applications/audio/xmms { xmms = import ../applications/audio/xmms {