From 879778c5837c9d5df420806491669e1a6db3bd87 Mon Sep 17 00:00:00 2001 From: Matthew Piziak Date: Thu, 14 May 2020 22:12:31 -0400 Subject: [PATCH] add `enableSound` parameter to `dwarf-fortress` derivation try hardcoding add back whitespace --- pkgs/games/dwarf-fortress/lazy-pack.nix | 3 ++- pkgs/games/dwarf-fortress/wrapper/default.nix | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index e5cfe6da1718..03aa5d54304f 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -16,6 +16,7 @@ , enableTruetype ? true , enableFPS ? false , enableTextMode ? false +, enableSound ? true }: with lib; @@ -32,7 +33,7 @@ buildEnv { paths = [ (dwarf-fortress.override { inherit enableDFHack enableTWBT enableSoundSense enableStoneSense theme - enableIntro enableTruetype enableFPS enableTextMode; + enableIntro enableTruetype enableFPS enableTextMode enableSound; })] ++ lib.optional enableDwarfTherapist dwarf-therapist ++ lib.optional enableLegendsBrowser legends-browser; diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 31b21c5a4351..79b63e3ce9ee 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -12,6 +12,7 @@ , enableTruetype ? true , enableFPS ? false , enableTextMode ? false +, enableSound ? true }: let @@ -67,7 +68,8 @@ let substituteInPlace $out/data/init/init.txt \ --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \ --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \ - --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]' + --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]' \ + --replace '[SOUND:YES]' '[SOUND:${unBool enableSound}]' '')); env = buildEnv {