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: 4507926b80c6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0c774fa8c651
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 6, 2018

  1. dwarf-fortress: fix most of customization options 

    see #49779
close #49803

(cherry picked from commit 290dd06)
    @Lassulus @bendlas
    Lassulus authored and bendlas committed Nov 6, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    nomadium Miguel Landaeta
    GPG key ID: AFB8E0FC9231CC6D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0c774fa View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/games/dwarf-fortress/wrapper/default.nix
4 changes: 2 additions & 2 deletions pkgs/games/dwarf-fortress/wrapper/default.nix
View file
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ let
++ lib.optional enableTWBT twbt.art
++ [ dwarf-fortress ];

fixup = lib.singleton (runCommand "fixup" {} ''
fixup = lib.singleton (runCommand "fixup" {} (''
mkdir -p $out/data/init
cp ${dwarf-fortress}/data/init/init.txt $out/data/init/init.txt
'' + lib.optionalString enableDFHack ''
@@ -60,7 +60,7 @@ let
--replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \
--replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \
--replace '[FPS:NO]' '[FPS:${unBool enableFPS}]'
'');
''));

env = buildEnv {
name = "dwarf-fortress-env-${dwarf-fortress.dfVersion}";