diff options
| author | Charles Strahan <charles.c.strahan@gmail.com> | 2015-04-14 19:54:57 -0400 |
|---|---|---|
| committer | Charles Strahan <charles.c.strahan@gmail.com> | 2015-04-14 19:54:57 -0400 |
| commit | 290c72753a5478cc511721274d34bdf8a6d9dacf (patch) | |
| tree | e6485e1f26f8169cfe5cf3a89cdaf1a1a3a62ae6 /pkgs/development/compilers/ghcjs | |
| parent | e86348fa66fca4c1ffade903fa689a27e5f16a35 (diff) | |
| download | nixpkgs-290c72753a5478cc511721274d34bdf8a6d9dacf.tar nixpkgs-290c72753a5478cc511721274d34bdf8a6d9dacf.tar.gz nixpkgs-290c72753a5478cc511721274d34bdf8a6d9dacf.tar.bz2 nixpkgs-290c72753a5478cc511721274d34bdf8a6d9dacf.tar.lz nixpkgs-290c72753a5478cc511721274d34bdf8a6d9dacf.tar.xz nixpkgs-290c72753a5478cc511721274d34bdf8a6d9dacf.tar.zst nixpkgs-290c72753a5478cc511721274d34bdf8a6d9dacf.zip | |
ghcjs: fix on 32-bit systems
fixes #7341
Diffstat (limited to 'pkgs/development/compilers/ghcjs')
| -rw-r--r-- | pkgs/development/compilers/ghcjs/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
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 |