JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ghcjs: add version to haskellCompilerName

Browse Source 
This is needed for some cabal2nix stuff in getting the version.
Previously we had left out the version but apparently this can cause
problems in some scenarios.

/cc @elvishjerricco @peti @ericson2314
This commit is contained in:
Matthew Bauer 2018-06-14 11:35:19 -04:00
parent a87b177be9
commit a9400e64e7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/ghcjs-ng/default.nix
View File

@ -48,7 +48,7 @@ let
stage1Packages = [];
mkStage2 = _: {};
haskellCompilerName = "ghcjs";
haskellCompilerName = "ghcjs-${bootGhcjs.version}";
};
bootGhcjs = haskellLib.justStaticExecutables passthru.bootPkgs.ghcjs;

2
pkgs/development/compilers/ghcjs/base.nix
View File

@ -174,7 +174,7 @@ in mkDerivation (rec {
isGhcjs = true;
inherit nodejs ghcjsBoot;
socket-io = pkgs.nodePackages."socket.io";
haskellCompilerName = "ghcjs";
haskellCompilerName = "ghcjs-${version}";
# let us assume ghcjs is never actually cross compiled
targetPrefix = "";