summary refs log tree commit diff
path: root/pkgs/games/dwarf-fortress
diff options
context:
space:
mode:
authorSvein Ove Aas <sveina@gmail.com>2018-07-04 20:18:20 +0100
committerSvein Ove Aas <sveina@gmail.com>2018-07-04 20:19:24 +0100
commit8c7461a348439c789a78344d17e6ebc6fb58a986 (patch)
tree155abc08f37fbbe9428d1780ed8972c568c27e15 /pkgs/games/dwarf-fortress
parentfb29756259eaf7004e0a791df16ee4bfd3b8f713 (diff)
downloadnixpkgs-8c7461a348439c789a78344d17e6ebc6fb58a986.tar
nixpkgs-8c7461a348439c789a78344d17e6ebc6fb58a986.tar.gz
nixpkgs-8c7461a348439c789a78344d17e6ebc6fb58a986.tar.bz2
nixpkgs-8c7461a348439c789a78344d17e6ebc6fb58a986.tar.lz
nixpkgs-8c7461a348439c789a78344d17e6ebc6fb58a986.tar.xz
nixpkgs-8c7461a348439c789a78344d17e6ebc6fb58a986.tar.zst
nixpkgs-8c7461a348439c789a78344d17e6ebc6fb58a986.zip
dwarf-fortress: Don't check for dfVersion compatability on themes, which lack them.
Diffstat (limited to 'pkgs/games/dwarf-fortress')
-rw-r--r--pkgs/games/dwarf-fortress/wrapper/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index e82cc2be680..7d64252a813 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;