From 8818dbedbfba7e61dfe95cdb3462999c242f0d6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 20 Oct 2013 18:26:32 +0200 Subject: [PATCH] Adding an attribute for the gtk freeciv too. --- pkgs/games/freeciv/default.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 3eda4e8d88d5..ac1fc7395ae2 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -6,12 +6,17 @@ 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"; in -stdenv.mkDerivation rec { - name = "freeciv-2.4.0"; +stdenv.mkDerivation { + name = baseName + sdlName + gtkName; src = fetchurl { - url = "mirror://sourceforge/freeciv/${name}.tar.bz2"; + url = "mirror://sourceforge/freeciv/${baseName}.tar.bz2"; sha256 = "1bc01pyihsrby6w95n49gi90ggp40dyxsy4kmlmwcakxfxprwakv"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4dc3958ddaf3..851deff3a3cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9186,6 +9186,11 @@ let freeciv = callPackage ../games/freeciv { }; + freeciv_gtk = callPackage ../games/freeciv { + gtkClient = true; + sdlClient = false; + }; + freedink = callPackage ../games/freedink { }; fsg = callPackage ../games/fsg {