diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-05-07 03:43:24 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-05-07 11:59:53 +0300 |
| commit | a7fe84e38a96bdfd6a19c5e549c7c838fb3167a5 (patch) | |
| tree | 5aaeefd65ff6ea6fd3f9d9759662eb9e309e7668 /pkgs/games/openspades | |
| parent | a211eef81a02425f236c7b890bb5bcc9a60ae740 (diff) | |
| download | nixpkgs-a7fe84e38a96bdfd6a19c5e549c7c838fb3167a5.tar nixpkgs-a7fe84e38a96bdfd6a19c5e549c7c838fb3167a5.tar.gz nixpkgs-a7fe84e38a96bdfd6a19c5e549c7c838fb3167a5.tar.bz2 nixpkgs-a7fe84e38a96bdfd6a19c5e549c7c838fb3167a5.tar.lz nixpkgs-a7fe84e38a96bdfd6a19c5e549c7c838fb3167a5.tar.xz nixpkgs-a7fe84e38a96bdfd6a19c5e549c7c838fb3167a5.tar.zst nixpkgs-a7fe84e38a96bdfd6a19c5e549c7c838fb3167a5.zip | |
openspades: link to openal instead of using LD_LIBRARY_PATH
Diffstat (limited to 'pkgs/games/openspades')
| -rw-r--r-- | pkgs/games/openspades/default.nix | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 475a844c1ab..bfec5a30f96 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, curl, glew, makeWrapper, mesa, SDL2, +{ stdenv, lib, fetchurl, cmake, curl, glew, makeWrapper, mesa, SDL2, SDL2_image, unzip, wget, zlib, withOpenal ? true, openal ? null }: assert withOpenal -> openal != null; @@ -20,9 +20,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = - with stdenv.lib; [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ] - ++ optional withOpenal openal; + ++ lib.optional withOpenal openal; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" ]; @@ -38,13 +37,7 @@ stdenv.mkDerivation rec { unzip -u -o Resources/DevPaks27.zip -d Resources/DevPak ''; - # OpenAL is loaded dynamicly - postInstall = - if withOpenal then '' - wrapProgram "$out/bin/openspades" \ - --prefix LD_LIBRARY_PATH : "${openal}/lib" - '' - else null; + NIX_CFLAGS_LINK = lib.optional withOpenal "-lopenal"; meta = with stdenv.lib; { description = "A compatible client of Ace of Spades 0.75"; |