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/liquidwar | |
| 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/liquidwar')
| -rw-r--r-- | nixpkgs/pkgs/games/liquidwar/5.nix | 8 | ||||
| -rw-r--r-- | nixpkgs/pkgs/games/liquidwar/default.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/games/liquidwar/5.nix b/nixpkgs/pkgs/games/liquidwar/5.nix index 3d8cf3840f8b..e95371ec5eaf 100644 --- a/nixpkgs/pkgs/games/liquidwar/5.nix +++ b/nixpkgs/pkgs/games/liquidwar/5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, allegro }: +{ lib, stdenv, fetchurl, allegro }: stdenv.mkDerivation rec { version = "5.6.5"; pname = "liquidwar5"; @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { buildInputs = [ allegro ]; - configureFlags = stdenv.lib.optional stdenv.isx86_64 "--disable-asm"; + configureFlags = lib.optional stdenv.isx86_64 "--disable-asm"; hardeningDisable = [ "format" ]; NIX_CFLAGS_COMPILE = [ "-lm" ]; - meta = with stdenv.lib; { - description = ''The classic version of a quick tactics game LiquidWar''; + meta = with lib; { + description = "The classic version of a quick tactics game LiquidWar"; maintainers = [ maintainers.raskin ]; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/games/liquidwar/default.nix b/nixpkgs/pkgs/games/liquidwar/default.nix index 341d077879c2..09ddcb0346c8 100644 --- a/nixpkgs/pkgs/games/liquidwar/default.nix +++ b/nixpkgs/pkgs/games/liquidwar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorgproto, libX11, libXrender +{ lib, stdenv, fetchurl, xorgproto, libX11, libXrender , gmp, libjpeg, libpng , expat, gettext, perl, guile , SDL, SDL_image, SDL_mixer, SDL_ttf @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # To avoid problems finding SDL_types.h. configureFlags = [ "CFLAGS=-I${SDL.dev}/include/SDL" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Quick tactics game"; homepage = "https://www.gnu.org/software/liquidwar6/"; maintainers = [ maintainers.raskin ]; |