diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-12 14:34:05 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-12 15:12:11 +0200 |
commit | e8e0cb7f36641ffb7901178bc54fef98eba9215c (patch) | |
tree | 2c51a3d2f98232fae2cdedb8b96368802b125411 /default.nix | |
parent | 2ab4ee48a15da128536b27c77a224c08cd2e9b78 (diff) | |
download | thermoprint-e8e0cb7f36641ffb7901178bc54fef98eba9215c.tar thermoprint-e8e0cb7f36641ffb7901178bc54fef98eba9215c.tar.gz thermoprint-e8e0cb7f36641ffb7901178bc54fef98eba9215c.tar.bz2 thermoprint-e8e0cb7f36641ffb7901178bc54fef98eba9215c.tar.xz thermoprint-e8e0cb7f36641ffb7901178bc54fef98eba9215c.zip |
Fix build
Diffstat (limited to 'default.nix')
-rw-r--r-- | default.nix | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/default.nix b/default.nix index 2b84d30..aafeb4a 100644 --- a/default.nix +++ b/default.nix | |||
@@ -1,19 +1,12 @@ | |||
1 | args@{ | 1 | args@{ |
2 | compilerName ? "ghc802" | 2 | compilerName ? null |
3 | , extraPackages ? (p: []) | 3 | , extraPackages ? (p: []) |
4 | , ... | 4 | , ... |
5 | }: | 5 | }: |
6 | 6 | ||
7 | let | 7 | let |
8 | defaultPackages = import <nixpkgs> {}; | 8 | defaultPackages = import <nixpkgs> {}; |
9 | haskellPackages = defaultPackages.haskell.packages."${compilerName}".override { | 9 | haskellPackages = defaultPackages.haskellPackages; |
10 | overrides = self: super: with super; { | ||
11 | # threepenny-gui = pkgs.haskell.lib.appendPatch threepenny-gui ./threepenny.patch; | ||
12 | encoding = pkgs.haskell.lib.doJailbreak encoding; | ||
13 | cabal-test-quickcheck = pkgs.haskell.lib.doJailbreak cabal-test-quickcheck; | ||
14 | extended-reals = pkgs.haskell.lib.doJailbreak extended-reals; | ||
15 | }; | ||
16 | }; | ||
17 | pkgs = defaultPackages // haskellPackages // args; | 10 | pkgs = defaultPackages // haskellPackages // args; |
18 | callPackage = pkgs.lib.callPackageWith (pkgs // self); | 11 | callPackage = pkgs.lib.callPackageWith (pkgs // self); |
19 | self = { | 12 | self = { |
@@ -28,4 +21,4 @@ let | |||
28 | tprint = callPackage ./tprint/tprint.nix {}; | 21 | tprint = callPackage ./tprint/tprint.nix {}; |
29 | bbcode = callPackage ./bbcode/bbcode.nix {}; | 22 | bbcode = callPackage ./bbcode/bbcode.nix {}; |
30 | }; | 23 | }; |
31 | in self | 24 | in self // { inherit haskellPackages; } |