mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
haskell-modules/generic-builder.nix: add gcc to generated shell
Fixes #335387
This commit is contained in:
parent
c0e8cb5d87
commit
025cc46ce3
@ -1,5 +1,5 @@
|
|||||||
{ lib, stdenv, buildPackages, buildHaskellPackages, ghc
|
{ lib, stdenv, buildPackages, buildHaskellPackages, ghc
|
||||||
, jailbreak-cabal, hscolour, cpphs, runCommand
|
, jailbreak-cabal, hscolour, cpphs, runCommandCC
|
||||||
, ghcWithHoogle, ghcWithPackages
|
, ghcWithHoogle, ghcWithPackages
|
||||||
, nodejs
|
, nodejs
|
||||||
}:
|
}:
|
||||||
@ -790,7 +790,7 @@ stdenv.mkDerivation ({
|
|||||||
lib.optionals (!isCross) setupHaskellDepends);
|
lib.optionals (!isCross) setupHaskellDepends);
|
||||||
|
|
||||||
ghcCommandCaps = lib.toUpper ghcCommand';
|
ghcCommandCaps = lib.toUpper ghcCommand';
|
||||||
in runCommand name {
|
in runCommandCC name {
|
||||||
inherit shellHook;
|
inherit shellHook;
|
||||||
|
|
||||||
depsBuildBuild = lib.optional isCross ghcEnvForBuild;
|
depsBuildBuild = lib.optional isCross ghcEnvForBuild;
|
||||||
|
Loading…
Reference in New Issue
Block a user