diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2017-11-02 00:29:12 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-02 00:29:12 -0200 |
| commit | c07835a11bedd070aef2d2e86e7d03d579b560f3 (patch) | |
| tree | 8b7f11859dd719c4d6dd7cfd83da5c541d5a6454 /pkgs/development/compilers/ghcjs/base.nix | |
| parent | d3763a7164e7c8b1b269add0d0ed1e8f316bbdc9 (diff) | |
| parent | bb6257bd3a22f79b00350966e9de0786cae26f5b (diff) | |
| download | nixlib-c07835a11bedd070aef2d2e86e7d03d579b560f3.tar nixlib-c07835a11bedd070aef2d2e86e7d03d579b560f3.tar.gz nixlib-c07835a11bedd070aef2d2e86e7d03d579b560f3.tar.bz2 nixlib-c07835a11bedd070aef2d2e86e7d03d579b560f3.tar.lz nixlib-c07835a11bedd070aef2d2e86e7d03d579b560f3.tar.xz nixlib-c07835a11bedd070aef2d2e86e7d03d579b560f3.tar.zst nixlib-c07835a11bedd070aef2d2e86e7d03d579b560f3.zip | |
Merge branch 'master' into upd.lxqt
Diffstat (limited to 'pkgs/development/compilers/ghcjs/base.nix')
| -rw-r--r-- | pkgs/development/compilers/ghcjs/base.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index a7381fa1a146..d4418b058d92 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -40,11 +40,6 @@ , coreutils , libiconv -, ghcjsNodePkgs ? callPackage ../../../top-level/node-packages.nix { - generated = ./node-packages-generated.nix; - self = ghcjsNodePkgs; - } - , version ? "0.2.0" , ghcjsSrc ? fetchFromGitHub { owner = "ghcjs"; @@ -178,7 +173,7 @@ in mkDerivation (rec { isCross = true; isGhcjs = true; inherit nodejs ghcjsBoot; - inherit (ghcjsNodePkgs) "socket.io"; + socket-io = pkgs.nodePackages."socket.io"; inherit stage1Packages; mkStage2 = stage2 { |