diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-09 15:27:48 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-09 15:27:48 +0000 |
| commit | 977e608a38a933ba5f09876f15504f36fe1aece8 (patch) | |
| tree | 98a9f2a8bb9a46fa6aa0f01713da20e88ef2ad55 | |
| parent | f5ef46121763c36ab879fd4fda4d2d31f4c6e95c (diff) | |
| download | nixlib-977e608a38a933ba5f09876f15504f36fe1aece8.tar nixlib-977e608a38a933ba5f09876f15504f36fe1aece8.tar.gz nixlib-977e608a38a933ba5f09876f15504f36fe1aece8.tar.bz2 nixlib-977e608a38a933ba5f09876f15504f36fe1aece8.tar.lz nixlib-977e608a38a933ba5f09876f15504f36fe1aece8.tar.xz nixlib-977e608a38a933ba5f09876f15504f36fe1aece8.tar.zst nixlib-977e608a38a933ba5f09876f15504f36fe1aece8.zip | |
* 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
| -rw-r--r-- | pkgs/applications/video/xine-ui/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 52a4a7736079..256fa0a599fd 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7b257d8de5f..1680299e4303 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9056,8 +9056,7 @@ let }; xineUI = import ../applications/video/xine-ui { - inherit fetchurl stdenv pkgconfig x11 xineLib libpng readline ncurses curl; - inherit (xorg) libXext libXv libXxf86vm libXtst inputproto; + inherit fetchurl stdenv pkgconfig xlibs xineLib libpng readline ncurses curl; }; xmms = import ../applications/audio/xmms { |