From 8c7461a348439c789a78344d17e6ebc6fb58a986 Mon Sep 17 00:00:00 2001 From: Svein Ove Aas Date: Wed, 4 Jul 2018 20:18:20 +0100 Subject: dwarf-fortress: Don't check for dfVersion compatability on themes, which lack them. --- pkgs/games/dwarf-fortress/wrapper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/games/dwarf-fortress') diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index e82cc2be680d..7d64252a8138 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -17,15 +17,15 @@ let else theme; # These are in inverse order for first packages to override the next ones. - pkgs = lib.optional (theme != null) ptheme - ++ lib.optional enableDFHack dfhack_ + themePkg = lib.optional (theme != null) ptheme; + pkgs = lib.optional enableDFHack dfhack_ ++ lib.optional enableSoundSense soundSense ++ [ dwarf-fortress-original ]; env = buildEnv { name = "dwarf-fortress-env-${dwarf-fortress-original.dfVersion}"; - paths = pkgs; + paths = themePkg ++ pkgs; pathsToLink = [ "/" "/hack" "/hack/scripts" ]; ignoreCollisions = true; -- cgit 1.4.1