diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-06-08 18:06:47 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-06-08 18:06:47 +0200 |
| commit | fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74 (patch) | |
| tree | fc80390e190e04aeb8330522f475be313feac4b8 /pkgs/development/haskell-modules/make-package-set.nix | |
| parent | 9dfb0b2db04a42815356e6eabba9fac92ccf4cc4 (diff) | |
| parent | b9565143eaa17b7b7e03612769ebc6ca24eddae0 (diff) | |
| download | nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.gz nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.bz2 nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.lz nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.xz nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.zst nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/haskell-modules/make-package-set.nix')
| -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" ''; }; |