diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-06-07 14:58:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-07 14:58:10 -0400 |
| commit | 23f2dfd9f5a24a62efdf2805a7fb01d0008ef178 (patch) | |
| tree | f73ed7226418fb0f2f33b29768c1f3b92c137f7c /pkgs | |
| parent | d8bf4d3e09ad0c2e411eb31d37bf59d4c16215ee (diff) | |
| parent | f379be939c92a5775556e92564b435c077508a21 (diff) | |
| download | nixlib-23f2dfd9f5a24a62efdf2805a7fb01d0008ef178.tar nixlib-23f2dfd9f5a24a62efdf2805a7fb01d0008ef178.tar.gz nixlib-23f2dfd9f5a24a62efdf2805a7fb01d0008ef178.tar.bz2 nixlib-23f2dfd9f5a24a62efdf2805a7fb01d0008ef178.tar.lz nixlib-23f2dfd9f5a24a62efdf2805a7fb01d0008ef178.tar.xz nixlib-23f2dfd9f5a24a62efdf2805a7fb01d0008ef178.tar.zst nixlib-23f2dfd9f5a24a62efdf2805a7fb01d0008ef178.zip | |
Merge pull request #41641 from obsidiansystems/haskell-infra-latebind
haskell infra: Use `self.ghc` rather than closing over initial value
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 7fc921037a2a..a54967c4e45e 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -102,8 +102,7 @@ let callPackage = drv: args: callPackageWithScope defaultScope drv args; withPackages = packages: buildPackages.callPackage ./with-packages-wrapper.nix { - inherit (self) llvmPackages; - inherit ghc; + inherit (self) ghc llvmPackages; inherit packages; }; @@ -120,7 +119,7 @@ let installPhase = '' export HOME="$TMP" mkdir -p "$out" - cabal2nix --compiler=${ghc.haskellCompilerName} --system=${hostPlatform.system} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" + cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.system} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" ''; }; |