diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
| commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
| tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/games/xpilot | |
| parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
| parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
| download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip | |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/games/xpilot')
| -rw-r--r-- | nixpkgs/pkgs/games/xpilot/bloodspilot-client.nix | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/games/xpilot/bloodspilot-server.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/games/xpilot/default.nix | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/games/xpilot/bloodspilot-client.nix b/nixpkgs/pkgs/games/xpilot/bloodspilot-client.nix index 4de27b1f18da..8e603ef53f78 100644 --- a/nixpkgs/pkgs/games/xpilot/bloodspilot-client.nix +++ b/nixpkgs/pkgs/games/xpilot/bloodspilot-client.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, SDL, libGLU, libGL, expat, zlib, SDL_ttf, SDL_image }: +{ lib, stdenv, fetchurl, libX11, SDL, libGLU, libGL, expat, zlib, SDL_ttf, SDL_image }: stdenv.mkDerivation rec { version = "1.5.0"; @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lX11"; meta = { - description = ''A multiplayer space combat game (client part)''; + description = "A multiplayer space combat game (client part)"; homepage = "http://bloodspilot.sf.net/"; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/games/xpilot/bloodspilot-server.nix b/nixpkgs/pkgs/games/xpilot/bloodspilot-server.nix index 6b0a0603af51..a860c4e1d5ff 100644 --- a/nixpkgs/pkgs/games/xpilot/bloodspilot-server.nix +++ b/nixpkgs/pkgs/games/xpilot/bloodspilot-server.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, expat }: +{ lib, stdenv, fetchurl, expat }: stdenv.mkDerivation rec { pname = "bloodspilot-xpilot-fxi-server"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ./server-gcc5.patch ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A multiplayer X11 space combat game (server part)"; homepage = "http://bloodspilot.sf.net/"; license = licenses.gpl2Plus ; diff --git a/nixpkgs/pkgs/games/xpilot/default.nix b/nixpkgs/pkgs/games/xpilot/default.nix index 8803806547bf..bd86538d99ec 100644 --- a/nixpkgs/pkgs/games/xpilot/default.nix +++ b/nixpkgs/pkgs/games/xpilot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libSM, SDL, libGLU, libGL, expat, SDL_ttf +{ lib, stdenv, fetchurl, libX11, libSM, SDL, libGLU, libGL, expat, SDL_ttf , SDL_image, zlib, libXxf86misc }: stdenv.mkDerivation rec { pname = "xpilot-ng"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libSM SDL SDL_ttf SDL_image libGLU libGL expat zlib libXxf86misc ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A multiplayer X11 space combat game"; homepage = "http://xpilot.sf.net/"; license = licenses.gpl2Plus; |