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

Commits on Nov 8, 2018

  1. dwarf-fortress: fix theme override

    @Lassulus @bendlas
    Lassulus authored and bendlas committed Nov 8, 2018
    Copy the full SHA
    0cd1e67 View commit details
Showing with 4 additions and 1 deletion.
  1. +4 −1 pkgs/games/dwarf-fortress/wrapper/default.nix
5 changes: 4 additions & 1 deletion pkgs/games/dwarf-fortress/wrapper/default.nix
View file
Original file line number Diff line number Diff line change
@@ -35,8 +35,11 @@ let

fixup = lib.singleton (runCommand "fixup" {} (''
mkdir -p $out/data/init
'' + (if (theme != null) then ''
cp ${lib.head themePkg}/data/init/init.txt $out/data/init/init.txt
'' else ''
cp ${dwarf-fortress}/data/init/init.txt $out/data/init/init.txt
'' + lib.optionalString enableDFHack ''
'') + lib.optionalString enableDFHack ''
mkdir -p $out/hack
# Patch the MD5