From 04bc0bd2b77283859e18897b5e0d9ffa179cfaa6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 20 May 2018 23:49:04 -0500
Subject: [PATCH] freeciv: cleanup overrides

This is how we do overrides elsewhere. The "name" suffix makes things
a little bit complicated IMO. Other input welcome.
---
 pkgs/games/freeciv/default.nix  | 5 +----
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index b0bead7bbf9..a1c1aa9b671 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -8,14 +8,11 @@
 let
   inherit (stdenv.lib) optional optionals;
 
-  sdlName = if sdlClient then "-sdl" else "";
-  gtkName = if gtkClient then "-gtk" else "";
-
   name = "freeciv";
   version = "2.5.11";
 in
 stdenv.mkDerivation {
-  name = "${name}${sdlName}${gtkName}-${version}";
+  name = "${name}-${version}";
   inherit version;
 
   src = fetchurl {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4a530a5f45..2866c7cb434 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19218,7 +19218,7 @@ with pkgs;
 
   freeciv = callPackage ../games/freeciv { };
 
-  freeciv_gtk = callPackage ../games/freeciv {
+  freeciv_gtk = freeciv.override {
     gtkClient = true;
     sdlClient = false;
   };