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

Merge pull request #87915 from matthew-piziak/dwarf-fortress-enable-sound

Browse Source 
add `enableSound` parameter to `dwarf-fortress` derivation
This commit is contained in:
adisbladis 2020-05-23 02:34:10 +02:00 committed by GitHub
commit d8435f6d5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/games/dwarf-fortress/lazy-pack.nix
View File

@ -16,6 +16,7 @@
, enableTruetype ? true , enableTruetype ? true
, enableFPS ? false , enableFPS ? false
, enableTextMode ? false , enableTextMode ? false
, enableSound ? true
}: }:
with lib; with lib;
@ -32,7 +33,7 @@ buildEnv {
paths = [ paths = [
(dwarf-fortress.override { (dwarf-fortress.override {
inherit enableDFHack enableTWBT enableSoundSense enableStoneSense theme inherit enableDFHack enableTWBT enableSoundSense enableStoneSense theme
enableIntro enableTruetype enableFPS enableTextMode; enableIntro enableTruetype enableFPS enableTextMode enableSound;
})] })]
++ lib.optional enableDwarfTherapist dwarf-therapist ++ lib.optional enableDwarfTherapist dwarf-therapist
++ lib.optional enableLegendsBrowser legends-browser; ++ lib.optional enableLegendsBrowser legends-browser;

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

@ -12,6 +12,7 @@
, enableTruetype ? true , enableTruetype ? true
, enableFPS ? false , enableFPS ? false
, enableTextMode ? false , enableTextMode ? false
, enableSound ? true
}: }:
let let
@ -67,7 +68,8 @@ let
substituteInPlace $out/data/init/init.txt \ substituteInPlace $out/data/init/init.txt \
--replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \ --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \
--replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \ --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 { env = buildEnv {