summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-09-03 21:30:23 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2017-09-03 21:30:23 +0200
commit17f5837b2ea8b8656c5f7ee10e2401f45f5e961f (patch)
treed46b1026b27b8f5ec675122d24ad917fd50471e4
parentdf7bc3cf8a5a808ebc4ac8675fb97eb721ac340f (diff)
downloadnixos-17f5837b2ea8b8656c5f7ee10e2401f45f5e961f.tar
nixos-17f5837b2ea8b8656c5f7ee10e2401f45f5e961f.tar.gz
nixos-17f5837b2ea8b8656c5f7ee10e2401f45f5e961f.tar.bz2
nixos-17f5837b2ea8b8656c5f7ee10e2401f45f5e961f.tar.xz
nixos-17f5837b2ea8b8656c5f7ee10e2401f45f5e961f.zip
-rw-r--r--bragi.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/bragi.nix b/bragi.nix
index 280d87a4..f15e3775 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -28,18 +28,17 @@ in rec {
28 28
29 nixpkgs.config.packageOverrides = oldPkgs: 29 nixpkgs.config.packageOverrides = oldPkgs:
30 rec { 30 rec {
31 haskellPackages = oldPkgs.haskell.packages.ghc802.override { 31 haskellPackages = oldPkgs.haskellPackages {
32 overrides = self: super: { 32 overrides = self: super: {
33 trivmix = self.callPackage ./custom/trivmix/trivmix.nix {}; 33 trivmix = self.callPackage ./custom/trivmix/trivmix.nix {};
34 inherit 34 inherit
35 (lib.mapAttrs (name: pkgs.haskell.lib.dontCheck) super) 35 (lib.mapAttrs (name: oldPkgs.haskell.lib.dontCheck) super)
36 Glob filelock; 36 Glob filelock;
37 inherit 37 inherit
38 ((import ./custom/thermoprint) { extraPackages = (p: with p; [ persistent-postgresql ]); }) 38 (pkgs.lib.callPackageWith (pkgs // self) ./custom/thermoprint { extraPackages = (p: with p; [ persistent-postgresql ]); })
39 thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; 39 thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;
40 }; 40 };
41 }; 41 };
42 haskell.packages.ghc802 = haskellPackages;
43 42
44 jack2Full = oldPkgs.jack2Full.override { dbus = null; }; 43 jack2Full = oldPkgs.jack2Full.override { dbus = null; };
45 44