ghcjs: refactor stage2 handling
Previously, the stage2 information was stored in haskell-modules, and imported directly from there. However, the correct stage2 information is determined by the version of ghcjs-boot repository. This commit makes the stage2 information part of the ghcjs derivation, which improves organization and makes it possible to override stage2 when overriding ghcjs.
This commit is contained in:
@@ -9,11 +9,9 @@ with import ./lib.nix { inherit pkgs; };
|
||||
|
||||
self: super:
|
||||
# The stage 2 packages. Regenerate with ./ghcjs/gen-stage2.rb
|
||||
let stage2 =
|
||||
(import ./ghcjs/stage2.nix {
|
||||
let stage2 = super.ghc.mkStage2 {
|
||||
inherit (self) callPackage;
|
||||
inherit (self.ghc) ghcjsBoot;
|
||||
}); in stage2 // {
|
||||
}; in stage2 // {
|
||||
|
||||
old-time = overrideCabal stage2.old-time (drv: {
|
||||
postPatch = ''
|
||||
|
||||
Reference in New Issue
Block a user