Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 992a34d8fbb2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d8435f6d5fe2
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 18, 2020

  1. add enableSound parameter to dwarf-fortress derivation 

    try hardcoding

add back whitespace
    @matthew-piziak
    matthew-piziak committed May 18, 2020
    Copy the full SHA
    879778c View commit details

Commits on May 23, 2020

  1. Merge pull request #87915 from matthew-piziak/dwarf-fortress-enable-s… 

    …ound

add `enableSound` parameter to `dwarf-fortress` derivation
    @adisbladis
    adisbladis authored May 23, 2020
    Copy the full SHA
    d8435f6 View commit details
Showing with 5 additions and 2 deletions.
  1. +2 −1 pkgs/games/dwarf-fortress/lazy-pack.nix
  2. +3 −1 pkgs/games/dwarf-fortress/wrapper/default.nix
3 changes: 2 additions & 1 deletion pkgs/games/dwarf-fortress/lazy-pack.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 3 additions & 1 deletion pkgs/games/dwarf-fortress/wrapper/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 {