From 290c72753a5478cc511721274d34bdf8a6d9dacf Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Tue, 14 Apr 2015 19:54:57 -0400 Subject: ghcjs: fix on 32-bit systems fixes #7341 --- pkgs/development/compilers/ghcjs/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs/development/compilers/ghcjs') diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 01adee8c6e1..3b898713bcb 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -39,7 +39,10 @@ }: let version = "0.1.0"; - libDir = "share/ghcjs/${pkgs.stdenv.system}-${version}-${ghc.version}/ghcjs"; + ghcArch = if pkgs.stdenv.system == "i686-linux" + then "i386-linux" + else pkgs.stdenv.system; + libDir = "share/ghcjs/${ghcArch}-${version}-${ghc.version}/ghcjs"; ghcjsBoot = fetchgit { url = git://github.com/ghcjs/ghcjs-boot.git; rev = "8cd6144870470258fb037b3e04a0a2a98c2b6551"; # 7.10 branch -- cgit 1.4.1