diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-08-12 06:58:49 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-08-12 06:59:17 +0200 |
| commit | 0a33842ea39ab4231462d0310a5bd69b76b48973 (patch) | |
| tree | 2761bffbcc546b652fa782bc2236e4a612cbca85 /pkgs/games | |
| parent | f4dc055689e68600033b960ff892edca213253e9 (diff) | |
| parent | d460e1b5c26570d3e124ab9a5bd04764610cff6c (diff) | |
| download | nixlib-0a33842ea39ab4231462d0310a5bd69b76b48973.tar nixlib-0a33842ea39ab4231462d0310a5bd69b76b48973.tar.gz nixlib-0a33842ea39ab4231462d0310a5bd69b76b48973.tar.bz2 nixlib-0a33842ea39ab4231462d0310a5bd69b76b48973.tar.lz nixlib-0a33842ea39ab4231462d0310a5bd69b76b48973.tar.xz nixlib-0a33842ea39ab4231462d0310a5bd69b76b48973.tar.zst nixlib-0a33842ea39ab4231462d0310a5bd69b76b48973.zip | |
Merge #9089: freeciv: 2.4.0 -> 2.5.0, fix name scheme
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/freeciv/default.nix | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index ac1fc7395ae2..1ad9685a5056 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -1,32 +1,39 @@ { stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext -, sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype +, sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth , gtkClient ? false, gtk , server ? true, readline }: let inherit (stdenv.lib) optional optionals; - client = sdlClient || gtkClient; sdlName = if sdlClient then "-sdl" else ""; gtkName = if gtkClient then "-gtk" else ""; - baseName = "freeciv-2.4.0"; + name = "freeciv"; + version = "2.5.0"; in stdenv.mkDerivation { - name = baseName + sdlName + gtkName; + name = "${name}${sdlName}${gtkName}-${version}"; src = fetchurl { - url = "mirror://sourceforge/freeciv/${baseName}.tar.bz2"; - sha256 = "1bc01pyihsrby6w95n49gi90ggp40dyxsy4kmlmwcakxfxprwakv"; + url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2"; + sha256 = "bd9f7523ea79b8d2806d0c1844a9f48506ccd18276330580319913c43051210b"; + # sha1 = "477b60e02606e47b31a019b065353c1a6da6c305"; + # md5 = "8a61ecd986853200326711446c573f1b"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib bzip2 curl lzma gettext ] - ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype ] - ++ optional gtkClient gtk + ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ] + ++ optionals gtkClient [ gtk ] ++ optional server readline; + configureFlags = [] + ++ optional sdlClient "--enable-client=sdl" + ++ optional (!gtkClient) "--enable-fcmp=cli" + ++ optional (!server) "--disable-server"; + meta = with stdenv.lib; { description = "Multiplayer (or single player), turn-based strategy game"; |