diff options
| author | John Ericson <subscribe@JohnEricson.me> | 2018-09-17 16:20:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-17 16:20:56 -0400 |
| commit | 9f768ff43cece413e922f93cf861a28eaa969c41 (patch) | |
| tree | a57fcaf2646aae9e91f86e5cd99b4eb51f59abd1 | |
| parent | 5f2eacccf61c5535453a8160be3da643f319875e (diff) | |
| parent | 8da28de0e8c62c51def43d224d64f58946fabb05 (diff) | |
| download | nixpkgs-9f768ff43cece413e922f93cf861a28eaa969c41.tar nixpkgs-9f768ff43cece413e922f93cf861a28eaa969c41.tar.gz nixpkgs-9f768ff43cece413e922f93cf861a28eaa969c41.tar.bz2 nixpkgs-9f768ff43cece413e922f93cf861a28eaa969c41.tar.lz nixpkgs-9f768ff43cece413e922f93cf861a28eaa969c41.tar.xz nixpkgs-9f768ff43cece413e922f93cf861a28eaa969c41.tar.zst nixpkgs-9f768ff43cece413e922f93cf861a28eaa969c41.zip | |
Merge pull request #46795 from obsidiansystems/late-bind-buildHaskellPackages
haskell infra: "late bind" `buildHaskellPackages`
| -rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index b33b29e82ef..b6fe399058c 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -43,10 +43,9 @@ let mkDerivationImpl = pkgs.callPackage ./generic-builder.nix { inherit stdenv; nodejs = buildPackages.nodejs-slim; - inherit buildHaskellPackages; - inherit (self) ghc; - inherit (buildHaskellPackages) jailbreak-cabal; - hscolour = overrideCabal buildHaskellPackages.hscolour (drv: { + inherit (self) buildHaskellPackages ghc; + inherit (self.buildHaskellPackages) jailbreak-cabal; + hscolour = overrideCabal self.buildHaskellPackages.hscolour (drv: { isLibrary = false; doHaddock = false; hyperlinkSource = false; # Avoid depending on hscolour for this build. |