From c68b4a9297c7ac4fda3fbfe2f898b1158b4df948 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 3 Apr 2010 23:01:36 +0000 Subject: [PATCH] pkgs/games/warsow: Now mesa will be added to RPATH. Small cleanup. svn path=/nixpkgs/trunk/; revision=20935 --- pkgs/games/warsow/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index e3d17e855d5..5b6850b24ac 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -19,10 +19,9 @@ stdenv.mkDerivation rec { cd source unzip $src2 'basewsw/*' -d release ''; - inherit openal; patchPhase = '' - substituteInPlace Makefile --replace "openal-config" "pkg-config openal" - substituteInPlace snd_openal/snd_main.c --replace libopenal.so.0 $openal/lib/libopenal.so + substituteInPlace Makefile --replace openal-config 'pkg-config openal' + substituteInPlace snd_openal/snd_main.c --replace libopenal.so.0 ${openal}/lib/libopenal.so ''; buildInputs = [ unzip pkgconfig zlib curl libjpeg libvorbis libXxf86dga libXxf86vm libXinerama SDL mesa openal ]; @@ -38,6 +37,11 @@ stdenv.mkDerivation rec { cp -rv basewsw libs $dest cp -v warsow wsw_server wswtv_server $out/bin ''; + postFixup = '' + p=$out/opt/warsow/warsow.* + cur_rpath=$(patchelf --print-rpath $p) + patchelf --set-rpath $cur_rpath:${mesa}/lib $p + ''; meta = { description = "A multiplayer FPS designed for competitive gaming."; longDescription = ''