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

dwarf-fortress: Don't check for dfVersion compatability on themes, which lack them.

This commit is contained in:
Svein Ove Aas 2018-07-04 20:18:20 +01:00
parent fb29756259
commit 8c7461a348
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/games/dwarf-fortress/wrapper/default.nix
View File

@ -17,15 +17,15 @@ let
else theme; else theme;
# These are in inverse order for first packages to override the next ones. # These are in inverse order for first packages to override the next ones.
pkgs = lib.optional (theme != null) ptheme themePkg = lib.optional (theme != null) ptheme;
++ lib.optional enableDFHack dfhack_ pkgs = lib.optional enableDFHack dfhack_
++ lib.optional enableSoundSense soundSense ++ lib.optional enableSoundSense soundSense
++ [ dwarf-fortress-original ]; ++ [ dwarf-fortress-original ];
env = buildEnv { env = buildEnv {
name = "dwarf-fortress-env-${dwarf-fortress-original.dfVersion}"; name = "dwarf-fortress-env-${dwarf-fortress-original.dfVersion}";
paths = pkgs; paths = themePkg ++ pkgs;
pathsToLink = [ "/" "/hack" "/hack/scripts" ]; pathsToLink = [ "/" "/hack" "/hack/scripts" ];
ignoreCollisions = true; ignoreCollisions = true;