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

GHCJS darwin fixes (#41120)

Browse Source 
* GHCJS darwin fixes

* Fix ghcjs 80 and 710 packages

* Add socket-io to ghcjs 82 and 84 passthru
This commit is contained in:
Will Fancher 2018-05-29 17:39:21 -04:00 committed by xeji
parent b02b464852
commit 7a23f1acca
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,9 @@
, xorg , xorg
, gmp , gmp
, pkgconfig , pkgconfig
, gcc
, lib , lib
, nodePackages
, ghcjsDepOverrides ? (_:_:{}) , ghcjsDepOverrides ? (_:_:{})
}: }:
@ -40,6 +42,8 @@ let
inherit (bootGhcjs) version; inherit (bootGhcjs) version;
isGhcjs = true; isGhcjs = true;
socket-io = nodePackages."socket.io";
# Relics of the old GHCJS build system # Relics of the old GHCJS build system
stage1Packages = []; stage1Packages = [];
mkStage2 = _: {}; mkStage2 = _: {};
@ -49,7 +53,7 @@ let
libexec = libexec =
if builtins.compareVersions bootGhcjs.version "8.3" <= 0 if builtins.compareVersions bootGhcjs.version "8.3" <= 0
then "${bootGhcjs}/bin" then "${bootGhcjs}/bin"
else "${bootGhcjs}/libexec/${stdenv.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}"; else "${bootGhcjs}/libexec/${builtins.replaceStrings ["darwin"] ["osx"] stdenv.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "ghcjs"; name = "ghcjs";
@ -63,6 +67,8 @@ in stdenv.mkDerivation {
xorg.lndir xorg.lndir
gmp gmp
pkgconfig pkgconfig
] ++ lib.optionals stdenv.isDarwin [
gcc # https://github.com/ghcjs/ghcjs/issues/663
]; ];
phases = ["unpackPhase" "buildPhase"]; phases = ["unpackPhase" "buildPhase"];
buildPhase = '' buildPhase = ''

4
pkgs/top-level/haskell-packages.nix
View File

@ -159,13 +159,13 @@ in rec {
ghcjs = packages.ghcjs82; ghcjs = packages.ghcjs82;
ghcjs710 = callPackage ../development/haskell-modules rec { ghcjs710 = callPackage ../development/haskell-modules rec {
buildHaskellPackages = ghc.bootPkgs; buildHaskellPackages = ghc.bootPkgs;
ghc = bh.compiler.ghcjs; ghc = bh.compiler.ghcjs710;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
}; };
ghcjs80 = callPackage ../development/haskell-modules rec { ghcjs80 = callPackage ../development/haskell-modules rec {
buildHaskellPackages = ghc.bootPkgs; buildHaskellPackages = ghc.bootPkgs;
ghc = bh.compiler.ghcjsHEAD; ghc = bh.compiler.ghcjs80;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };
packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
}; };