diff options
author | Gregor Kleen <pngwjpgh@users.noreply.github.com> | 2017-01-23 16:08:09 +0100 |
---|---|---|
committer | Gregor Kleen <pngwjpgh@users.noreply.github.com> | 2017-01-23 16:08:09 +0100 |
commit | 59a7e3d173c23096fe3122505b1b759f26e3292a (patch) | |
tree | f974b10be38bea77b674a6bb3ef9da0e4a06f795 /default.nix | |
parent | 023678dc00bcc5ebb93a33cec762f48cb9cf80ff (diff) | |
download | thermoprint-59a7e3d173c23096fe3122505b1b759f26e3292a.tar thermoprint-59a7e3d173c23096fe3122505b1b759f26e3292a.tar.gz thermoprint-59a7e3d173c23096fe3122505b1b759f26e3292a.tar.bz2 thermoprint-59a7e3d173c23096fe3122505b1b759f26e3292a.tar.xz thermoprint-59a7e3d173c23096fe3122505b1b759f26e3292a.zip |
Fix build
Diffstat (limited to 'default.nix')
-rw-r--r-- | default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/default.nix b/default.nix index 0aa8c9e..09e2b7b 100644 --- a/default.nix +++ b/default.nix | |||
@@ -3,8 +3,12 @@ | |||
3 | }: | 3 | }: |
4 | 4 | ||
5 | rec { | 5 | rec { |
6 | haskellPackages = pkgs.haskell.packages."${compilerName}"; | 6 | haskellPackages = pkgs.haskell.packages."${compilerName}".override { |
7 | threepenny-gui = pkgs.haskell.lib.appendPatch haskellPackages.threepenny-gui ./threepenny.patch; | 7 | overrides = self: super: with super; { |
8 | # threepenny-gui = pkgs.haskell.lib.appendPatch threepenny-gui ./threepenny.patch; | ||
9 | encoding = pkgs.haskell.lib.doJailbreak encoding; | ||
10 | }; | ||
11 | }; | ||
8 | thermoprint-spec = haskellPackages.callPackage ./spec/thermoprint-spec.nix {}; | 12 | thermoprint-spec = haskellPackages.callPackage ./spec/thermoprint-spec.nix {}; |
9 | thermoprint-bbcode = haskellPackages.callPackage ./tp-bbcode/thermoprint-bbcode.nix { | 13 | thermoprint-bbcode = haskellPackages.callPackage ./tp-bbcode/thermoprint-bbcode.nix { |
10 | inherit bbcode thermoprint-spec; | 14 | inherit bbcode thermoprint-spec; |
@@ -19,7 +23,7 @@ rec { | |||
19 | }; | 23 | }; |
20 | }; | 24 | }; |
21 | thermoprint-webgui = haskellPackages.callPackage ./webgui/thermoprint-webgui.nix { | 25 | thermoprint-webgui = haskellPackages.callPackage ./webgui/thermoprint-webgui.nix { |
22 | inherit thermoprint-bbcode thermoprint-client threepenny-gui; | 26 | inherit thermoprint-bbcode thermoprint-client; |
23 | }; | 27 | }; |
24 | tprint = haskellPackages.callPackage ./tprint/tprint.nix { | 28 | tprint = haskellPackages.callPackage ./tprint/tprint.nix { |
25 | inherit thermoprint-bbcode thermoprint-client; | 29 | inherit thermoprint-bbcode thermoprint-client; |