JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freeciv: cleanup overrides

Browse Source 
This is how we do overrides elsewhere. The "name" suffix makes things
a little bit complicated IMO. Other input welcome.
This commit is contained in:
Matthew Bauer 2018-05-20 23:49:04 -05:00
parent dadb35fdb3
commit 04bc0bd2b7
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/games/freeciv/default.nix
View File

@ -8,14 +8,11 @@
let let
inherit (stdenv.lib) optional optionals; inherit (stdenv.lib) optional optionals;
sdlName = if sdlClient then "-sdl" else "";
gtkName = if gtkClient then "-gtk" else "";
name = "freeciv"; name = "freeciv";
version = "2.5.11"; version = "2.5.11";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "${name}${sdlName}${gtkName}-${version}"; name = "${name}-${version}";
inherit version; inherit version;
src = fetchurl { src = fetchurl {

2
pkgs/top-level/all-packages.nix
View File

@ -19218,7 +19218,7 @@ with pkgs;
freeciv = callPackage ../games/freeciv { }; freeciv = callPackage ../games/freeciv { };
freeciv_gtk = callPackage ../games/freeciv { freeciv_gtk = freeciv.override {
gtkClient = true; gtkClient = true;
sdlClient = false; sdlClient = false;
}; };