diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-20 23:49:04 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-21 19:55:37 -0500 |
| commit | 04bc0bd2b77283859e18897b5e0d9ffa179cfaa6 (patch) | |
| tree | 060eb5dc76b94245b911f788c9d35ff5816d0f53 /pkgs | |
| parent | dadb35fdb3ac1e368e8728728b269851752f1fbc (diff) | |
| download | nixlib-04bc0bd2b77283859e18897b5e0d9ffa179cfaa6.tar nixlib-04bc0bd2b77283859e18897b5e0d9ffa179cfaa6.tar.gz nixlib-04bc0bd2b77283859e18897b5e0d9ffa179cfaa6.tar.bz2 nixlib-04bc0bd2b77283859e18897b5e0d9ffa179cfaa6.tar.lz nixlib-04bc0bd2b77283859e18897b5e0d9ffa179cfaa6.tar.xz nixlib-04bc0bd2b77283859e18897b5e0d9ffa179cfaa6.tar.zst nixlib-04bc0bd2b77283859e18897b5e0d9ffa179cfaa6.zip | |
freeciv: cleanup overrides
This is how we do overrides elsewhere. The "name" suffix makes things a little bit complicated IMO. Other input welcome.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/games/freeciv/default.nix | 5 | ||||
| -rw-r--r-- | 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 b0bead7bbf9e..a1c1aa9b671d 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 b4a530a5f453..2866c7cb4347 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; }; |