summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-11-05 22:04:56 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2017-11-05 22:04:56 +0100
commitebe040b6e2af80d9ada0d8089c9b378cdbeccb8a (patch)
treef79f3fd22075cd14a59260f86cff83f5ed8d9cb7
parented3cc5077aa76cb247fe0fd722121376c3797eff (diff)
downloadnixos-ebe040b6e2af80d9ada0d8089c9b378cdbeccb8a.tar
nixos-ebe040b6e2af80d9ada0d8089c9b378cdbeccb8a.tar.gz
nixos-ebe040b6e2af80d9ada0d8089c9b378cdbeccb8a.tar.bz2
nixos-ebe040b6e2af80d9ada0d8089c9b378cdbeccb8a.tar.xz
nixos-ebe040b6e2af80d9ada0d8089c9b378cdbeccb8a.zip
-rw-r--r--bragi.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/bragi.nix b/bragi.nix
index 6b93f152..1e970548 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -29,12 +29,12 @@ in rec {
29 rec { 29 rec {
30 haskellPackages = oldPkgs.haskellPackages.override { 30 haskellPackages = oldPkgs.haskellPackages.override {
31 overrides = self: super: rec { 31 overrides = self: super: rec {
32 trivmix = self.callPackage ./custom/trivmix/trivmix.nix {}; 32 trivmix = self.callPackage ./custom/trivmix/trivmix.nix { inherit (self) Glob; };
33 inherit 33 inherit
34 (lib.mapAttrs (name: oldPkgs.haskell.lib.dontCheck) super) 34 (lib.mapAttrs (name: oldPkgs.haskell.lib.dontCheck) super)
35 Glob filelock; 35 Glob filelock;
36 inherit 36 inherit
37 (self.callPackage ./custom/thermoprint { inherit (pkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); }) 37 (self.callPackage ./custom/thermoprint { inherit (pkgs) runCommand makeWrapper; inherit (self) Glob; extraPackages = (p: with p; [ persistent-postgresql ]); })
38 thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; 38 thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;
39 }; 39 };
40 }; 40 };