summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <pngwjpgh@users.noreply.github.com>2016-08-02 14:32:34 +0200
committerGregor Kleen <pngwjpgh@users.noreply.github.com>2016-08-02 14:32:34 +0200
commit2812a065baa06b4c9dabc5b3e3f6d05ea59d21e5 (patch)
treebc192c8c169ae66a57e525a75c87eaab5ff39e44
parenta3f89c484165f4bcf4551c5ba91b14b08a6d41c1 (diff)
downloadnixos-2812a065baa06b4c9dabc5b3e3f6d05ea59d21e5.tar
nixos-2812a065baa06b4c9dabc5b3e3f6d05ea59d21e5.tar.gz
nixos-2812a065baa06b4c9dabc5b3e3f6d05ea59d21e5.tar.bz2
nixos-2812a065baa06b4c9dabc5b3e3f6d05ea59d21e5.tar.xz
nixos-2812a065baa06b4c9dabc5b3e3f6d05ea59d21e5.zip
scoping issues
-rw-r--r--bragi.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/bragi.nix b/bragi.nix
index aa339398..9143e793 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -26,7 +26,7 @@ in rec {
26 26
27 nixpkgs.config.packageOverrides = pkgs: 27 nixpkgs.config.packageOverrides = pkgs:
28 rec { 28 rec {
29 customizedHaskellPackages = pkgs.recurseIntoAttrs ( 29 haskellPackages = pkgs.recurseIntoAttrs (
30 pkgs.haskellPackages.override { 30 pkgs.haskellPackages.override {
31 overrides = self: super: let 31 overrides = self: super: let
32 callPackage = pkgs.lib.callPackageWith ( pkgs // self ); 32 callPackage = pkgs.lib.callPackageWith ( pkgs // self );
@@ -53,7 +53,7 @@ in rec {
53 53
54 inherit (pkgs.callPackage ./custom/thermoprint {}) thermoprint-server thermoprint-webgui tprint; 54 inherit (pkgs.callPackage ./custom/thermoprint {}) thermoprint-server thermoprint-webgui tprint;
55 55
56 inherit (pkgs.haskellPackages) trivmix; 56 inherit (haskellPackages) trivmix;
57 }; 57 };
58 58
59 environment.systemPackages = with pkgs; [ 59 environment.systemPackages = with pkgs; [