From 929dc4199a57b5d21eb72077f735eb33c4c7b09b Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Wed, 6 May 2015 15:56:02 -0400 Subject: ghcjs: properly wrap binaries in environment This also: 1 Builds Setup.hs with ghcjs, which (among other things) defines __GHCJS__ and ghcjs_HOST_OS during pre-processing. 2 Fixes ghc-paths to point at ghcjs and use NIX_GHCJS_* env-vars. 3 Boots ghcjs into $prefix/lib/$compiler. --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/development/haskell-modules/configuration-ghcjs.nix') diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index e880f7e713e8..aef6e6c9190c 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -99,4 +99,8 @@ self: super: { buildDepends = [ self.base self.mtl self.text self.ghcjs-base ]; }); + ghc-paths = overrideCabal super.ghc-paths (drv: { + patches = [ ./ghc-paths-nix-ghcjs.patch ]; + }); + } -- cgit 1.4.1