diff options
author | adisbladis <adisbladis@gmail.com> | 2019-11-10 16:44:34 +0000 |
---|---|---|
committer | adisbladis <adisbladis@gmail.com> | 2019-11-18 20:10:43 +0000 |
commit | c9d8624ccddf17aee28745446b6763aabb26b4c7 (patch) | |
tree | e7caf27ce92b6bc9b94eb65246cb6c2913adca44 /pkgs/games/xpilot | |
parent | e6963bc983048c6f2b2d29efc5921a2d8f0c6e9c (diff) | |
download | nixpkgs-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar nixpkgs-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.gz nixpkgs-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.bz2 nixpkgs-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.lz nixpkgs-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.xz nixpkgs-c9d8624ccddf17aee28745446b6763aabb26b4c7.tar.zst nixpkgs-c9d8624ccddf17aee28745446b6763aabb26b4c7.zip |
treewide: Get rid of libGLU_combined
Diffstat (limited to 'pkgs/games/xpilot')
-rw-r--r-- | pkgs/games/xpilot/bloodspilot-client.nix | 4 | ||||
-rw-r--r-- | pkgs/games/xpilot/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix index aefc8ad9876..257b0010245 100644 --- a/pkgs/games/xpilot/bloodspilot-client.nix +++ b/pkgs/games/xpilot/bloodspilot-client.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, SDL, libGLU_combined, expat, zlib, SDL_ttf, SDL_image }: +{ stdenv, fetchurl, libX11, SDL, libGLU, libGL, expat, zlib, SDL_ttf, SDL_image }: stdenv.mkDerivation rec { version = "1.5.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libX11 SDL SDL_ttf SDL_image libGLU_combined expat zlib + libX11 SDL SDL_ttf SDL_image libGLU libGL expat zlib ]; NIX_LDFLAGS = [ "-lX11" ]; diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix index d0fe9f61896..7d83dece333 100644 --- a/pkgs/games/xpilot/default.nix +++ b/pkgs/games/xpilot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libSM, SDL, libGLU_combined, expat, SDL_ttf +{ stdenv, fetchurl, libX11, libSM, SDL, libGLU, libGL, expat, SDL_ttf , SDL_image, zlib, libXxf86misc }: stdenv.mkDerivation rec { pname = "xpilot-ng"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "02a7pnp88kh88fzda5q8mzlckk6y9r5fw47j00h26wbsfly0k1zj"; }; buildInputs = [ - libX11 libSM SDL SDL_ttf SDL_image libGLU_combined expat zlib libXxf86misc + libX11 libSM SDL SDL_ttf SDL_image libGLU libGL expat zlib libXxf86misc ]; meta = with stdenv.lib; { description = "A multiplayer X11 space combat game"; |