diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2017-08-31 15:44:57 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2017-08-31 15:44:57 +0200 |
| commit | f48fba790d3c60b457d8a5760e77e52bf88d95ae (patch) | |
| tree | 32f7a450d7e86da10277ee35050b9c8a7b166a36 | |
| parent | 6e5a7028a99e6427f6ee2614db90b7154795d237 (diff) | |
| download | nixos-f48fba790d3c60b457d8a5760e77e52bf88d95ae.tar nixos-f48fba790d3c60b457d8a5760e77e52bf88d95ae.tar.gz nixos-f48fba790d3c60b457d8a5760e77e52bf88d95ae.tar.bz2 nixos-f48fba790d3c60b457d8a5760e77e52bf88d95ae.tar.xz nixos-f48fba790d3c60b457d8a5760e77e52bf88d95ae.zip | |
…
| -rw-r--r-- | bragi.nix | 24 |
1 files changed, 11 insertions, 13 deletions
| @@ -28,19 +28,17 @@ in rec { | |||
| 28 | 28 | ||
| 29 | nixpkgs.config.packageOverrides = pkgs: | 29 | nixpkgs.config.packageOverrides = pkgs: |
| 30 | rec { | 30 | rec { |
| 31 | haskellPackages = pkgs.recurseIntoAttrs ( | 31 | haskellPackages = pkgs.haskellPackages.override { |
| 32 | pkgs.haskellPackages.override { | 32 | overrides = self: super: { |
| 33 | overrides = self: super: { | 33 | trivmix = self.callPackage ./custom/trivmix/trivmix.nix {}; |
| 34 | trivmix = self.callPackage ./custom/trivmix/trivmix.nix { filelock = pkgs.haskell.lib.dontCheck super.filelock; }; | 34 | inherit |
| 35 | inherit | 35 | (lib.mapAttrs (name: pkgs.haskell.lib.dontCheck) super) |
| 36 | (lib.mapAttrs (name: pkgs.haskell.lib.dontCheck) super) | 36 | Glob filelock; |
| 37 | Glob filelock; | 37 | inherit |
| 38 | inherit | 38 | ((import ./custom/thermoprint) { extraPackages = (p: with p; [ persistent-postgresql ]); }) |
| 39 | ((import ./custom/thermoprint) { extraPackages = (p: with p; [ persistent-postgresql ]); }) | 39 | thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; |
| 40 | thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; | 40 | }; |
| 41 | }; | 41 | }; |
| 42 | } | ||
| 43 | ); | ||
| 44 | 42 | ||
| 45 | jack2Full = pkgs.jack2Full.override { dbus = null; }; | 43 | jack2Full = pkgs.jack2Full.override { dbus = null; }; |
| 46 | 44 | ||