diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-23 18:50:06 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-23 18:50:06 +0100 |
| commit | 0e8d2725dcc1aef5c56e63c939249b27190f6367 (patch) | |
| tree | 654e83b5f539b31947ee5011a0d1df797bf4c75d /pkgs/games/xpilot | |
| parent | 13c04c837db0f69705cfa4478c513b2230243ca2 (diff) | |
| parent | 415e1983ca650777d476d39de1db61a9e9877621 (diff) | |
| download | nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.gz nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.bz2 nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.lz nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.xz nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.zst nixpkgs-0e8d2725dcc1aef5c56e63c939249b27190f6367.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/games/xpilot')
| -rw-r--r-- | pkgs/games/xpilot/bloodspilot-client.nix | 19 | ||||
| -rw-r--r-- | pkgs/games/xpilot/default.nix | 4 |
2 files changed, 12 insertions, 11 deletions
diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix index e93d9cab352..c370f489d2c 100644 --- a/pkgs/games/xpilot/bloodspilot-client.nix +++ b/pkgs/games/xpilot/bloodspilot-client.nix @@ -1,20 +1,21 @@ -{stdenv, fetchurl, libX11, SDL, mesa, expat, SDL_ttf, SDL_image}: -let - buildInputs = [ - libX11 SDL SDL_ttf SDL_image mesa expat - ]; -in +{ stdenv, fetchurl, libX11, SDL, mesa, expat, zlib, SDL_ttf, SDL_image }: + stdenv.mkDerivation rec { version = "1.5.0"; name = "bloodspilot-client-${version}"; - inherit buildInputs; + src = fetchurl { url = "mirror://sourceforge/project/bloodspilot/client-sdl/v${version}/bloodspilot-client-sdl-${version}.tar.gz"; sha256 = "1qwl95av5an2zl01m7saj6fyy49xpixga7gbn4lwbpgpqs1rbwxj"; }; - NIX_LDFLAGS=["-lX11"]; + + buildInputs = [ + libX11 SDL SDL_ttf SDL_image mesa expat zlib + ]; + + NIX_LDFLAGS = [ "-lX11" ]; + meta = { - inherit version; description = ''A multiplayer space combat game (client part)''; homepage = "http://bloodspilot.sf.net/"; license = stdenv.lib.licenses.gpl2Plus ; diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix index fdbfd0f1675..5cfec74d963 100644 --- a/pkgs/games/xpilot/default.nix +++ b/pkgs/games/xpilot/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, libX11, SDL, mesa, expat, SDL_ttf, SDL_image}: +{stdenv, fetchurl, libX11, libSM, SDL, mesa, expat, SDL_ttf, SDL_image, zlib}: let buildInputs = [ - libX11 SDL SDL_ttf SDL_image mesa expat + libX11 libSM SDL SDL_ttf SDL_image mesa expat zlib ]; in stdenv.mkDerivation rec { |