diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-22 21:44:33 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-22 21:44:33 +0000 |
commit | 6f2fac6466cbc684f01093364e60bb96b79c120f (patch) | |
tree | 2b0ee90e26a0d6ed8a081351299a66daf35ef9f9 /pkgs/games/warsow/default.nix | |
parent | 6d62947d71342aa29441a720d4eeb2f003126c76 (diff) | |
parent | 93d2b4b7bfe5c78e36c93f94a0c057cde04b580f (diff) | |
download | nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.gz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.bz2 nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.lz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.xz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.zst nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.zip |
Merging from trunk.
I hope I resolved the conflicts well (gmp and gccCross) svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
Diffstat (limited to 'pkgs/games/warsow/default.nix')
-rw-r--r-- | pkgs/games/warsow/default.nix | 10 |
1 files 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 = '' |