diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-12-29 00:12:57 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-12-29 00:32:52 +0300 |
| commit | 5d5e0c19f663229a68c73166e58dae1d2f964d0d (patch) | |
| tree | 71a3b04df81f67890eed91ebc8e4c045557fc8d3 /pkgs/games/freeciv | |
| parent | cdf306909f3bf25fe962195c584dbe5b18ee9896 (diff) | |
| parent | 00c46ecd74ee8c85c30191652e3bb25f9c91867a (diff) | |
| download | nixpkgs-5d5e0c19f663229a68c73166e58dae1d2f964d0d.tar nixpkgs-5d5e0c19f663229a68c73166e58dae1d2f964d0d.tar.gz nixpkgs-5d5e0c19f663229a68c73166e58dae1d2f964d0d.tar.bz2 nixpkgs-5d5e0c19f663229a68c73166e58dae1d2f964d0d.tar.lz nixpkgs-5d5e0c19f663229a68c73166e58dae1d2f964d0d.tar.xz nixpkgs-5d5e0c19f663229a68c73166e58dae1d2f964d0d.tar.zst nixpkgs-5d5e0c19f663229a68c73166e58dae1d2f964d0d.zip | |
Merge commit 'refs/pull/21479/head' of git://github.com/NixOS/nixpkgs
Diffstat (limited to 'pkgs/games/freeciv')
| -rw-r--r-- | pkgs/games/freeciv/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index b5619644bd8..d33d0bf80a8 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth , gtkClient ? false, gtk2 -, server ? true, readline }: +, server ? true, readline +, enableSqlite ? true, sqlite +}: let inherit (stdenv.lib) optional optionals; @@ -10,14 +12,14 @@ let gtkName = if gtkClient then "-gtk" else ""; name = "freeciv"; - version = "2.5.3"; + version = "2.5.6"; in stdenv.mkDerivation { name = "${name}${sdlName}${gtkName}-${version}"; src = fetchurl { url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2"; - sha256 = "0p40bpkhbldsnlqdvfn3qd2vzadxfrfsf1r57x1akwabqs0h62s8"; + sha256 = "16wrnsx5rmbz6rjs03bhy0vn20i6n6g73lx7fjpai98ixhzc5bfg"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,10 +27,12 @@ stdenv.mkDerivation { buildInputs = [ zlib bzip2 curl lzma gettext ] ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ] ++ optionals gtkClient [ gtk2 ] - ++ optional server readline; + ++ optional server readline + ++ optional enableSqlite sqlite; configureFlags = [] ++ optional sdlClient "--enable-client=sdl" + ++ optional enableSqlite "--enable-fcdb=sqlite3" ++ optional (!gtkClient) "--enable-fcmp=cli" ++ optional (!server) "--disable-server"; |