diff options
| author | Will Fancher <elvishjerricco@gmail.com> | 2018-01-18 16:39:15 -0500 |
|---|---|---|
| committer | Will Fancher <elvishjerricco@gmail.com> | 2018-01-20 15:47:59 -0500 |
| commit | fcc8cae88d5429ae2693b03e870dfc4fe6a1c6bf (patch) | |
| tree | 54e2bd205bbcf34a93ac4937d28699780a173df2 /pkgs/development/compilers/ghcjs | |
| parent | 866717d75b64cb07cab16d0357edfd00cf339c20 (diff) | |
| download | nixlib-fcc8cae88d5429ae2693b03e870dfc4fe6a1c6bf.tar nixlib-fcc8cae88d5429ae2693b03e870dfc4fe6a1c6bf.tar.gz nixlib-fcc8cae88d5429ae2693b03e870dfc4fe6a1c6bf.tar.bz2 nixlib-fcc8cae88d5429ae2693b03e870dfc4fe6a1c6bf.tar.lz nixlib-fcc8cae88d5429ae2693b03e870dfc4fe6a1c6bf.tar.xz nixlib-fcc8cae88d5429ae2693b03e870dfc4fe6a1c6bf.tar.zst nixlib-fcc8cae88d5429ae2693b03e870dfc4fe6a1c6bf.zip | |
Fixed GHCJS
Diffstat (limited to 'pkgs/development/compilers/ghcjs')
| -rw-r--r-- | pkgs/development/compilers/ghcjs/base.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghcjs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghcjs/head.nix | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index 4a583af0cfe7..ab72d1fb1b3d 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -174,6 +174,7 @@ in mkDerivation (rec { isGhcjs = true; inherit nodejs ghcjsBoot; socket-io = pkgs.nodePackages."socket.io"; + haskellCompilerName = "ghcjs"; # let us assume ghcjs is never actually cross compiled targetPrefix = ""; diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index ff989ea22c40..7f3cc9440015 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -1,5 +1,5 @@ -{ bootPkgs }: +{ bootPkgs, cabal-install }: bootPkgs.callPackage ./base.nix { - inherit bootPkgs; + inherit bootPkgs cabal-install; } diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index 2cf6c8b39c24..84eb2d8bd0da 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -1,9 +1,9 @@ -{ fetchgit, fetchFromGitHub, bootPkgs }: +{ fetchgit, fetchFromGitHub, bootPkgs, cabal-install }: bootPkgs.callPackage ./base.nix { version = "0.2.020170323"; - inherit bootPkgs; + inherit bootPkgs cabal-install; ghcjsSrc = fetchFromGitHub { owner = "ghcjs"; |