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

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

svn path=/nixpkgs/branches/stdenv-updates/; revision=14980

1 files changed, 13 insertions, 7 deletions

diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index 52a4a773607..256fa0a599f 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -1,17 +1,23 @@
-args: with args;
+{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng, readline, ncurses, curl}:
+
 stdenv.mkDerivation {
   name = "xine-ui-0.99.5";
+  
   src = fetchurl {
     url = mirror://sourceforge/xine/xine-ui-0.99.5.tar.gz;
     sha256 = "07jywadk6fhk3wn1j9m0cfa0zy0i17kz0nyyxwa3shvhznfals0k";
   };
-  buildInputs = [
-    pkgconfig x11 xineLib libpng libXext libXv readline ncurses libXxf86vm
-	libXtst inputproto curl
-    (if xineLib.xineramaSupport then xineLib.libXinerama else null)
-  ];
+  
+  buildInputs =
+    [ pkgconfig xineLib libpng readline ncurses curl
+      xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto
+    ] ++ stdenv.lib.optional xineLib.xineramaSupport xineLib.libXinerama;
+
   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 = {
     description = "Xlib-based interface to Xine, a video player";