diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-06 17:05:02 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-06 19:19:29 -0400 |
| commit | 91184d159d000f74505eae336eeae5999e82b177 (patch) | |
| tree | b8ec3b12b1a8f137ef4a6900be8b4517f5944fc9 /pkgs/games/dwarf-fortress/default.nix | |
| parent | 75601e10cb30d5220c09c5d0cf2c8ee55fc4b34a (diff) | |
dwarf-fortress: move themes to .json file
This will make it easier to automate.
Diffstat (limited to 'pkgs/games/dwarf-fortress/default.nix')
| -rw-r--r-- | pkgs/games/dwarf-fortress/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 82710256c631c..ee2e442daa288 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -1,14 +1,14 @@ -{ pkgs, pkgsi686Linux, stdenv }: +{ pkgs, stdenv, stdenvNoCC, gccStdenv }: let callPackage = pkgs.newScope self; - callPackage_i686 = pkgsi686Linux.newScope self; self = rec { dwarf-fortress-original = callPackage ./game.nix { }; dfhack = callPackage ./dfhack { inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT; + stdenv = gccStdenv; }; soundSense = callPackage ./soundsense.nix { }; @@ -32,9 +32,13 @@ let dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { }; - phoebus-theme = callPackage ./themes/phoebus.nix { }; + themes = callPackage ./themes { + stdenv = stdenvNoCC; + }; + + phoebus-theme = themes.phoebus; - cla-theme = callPackage ./themes/cla.nix { }; + cla-theme = themes.cla; }; in self |