haskell.compiler.ghcjs: fix build (#228749)
Apply a patch from upstream `ghcjs/ghcjs/ghc-8.10` (not yet present in the obsidiansystems fork we follow) to fix a build failure caused by an emscripten update. As the patch itself modifies patches that are used during configuration (by `makePackages.sh`), it must be applied in the configured source derivation.
This commit is contained in:
parent
e1edd81558
commit
44f30edf56
@ -5,8 +5,7 @@
|
||||
, gcc
|
||||
, cabal-install
|
||||
, runCommand
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchpatch
|
||||
|
||||
, ghc
|
||||
, happy
|
||||
@ -28,7 +27,14 @@ runCommand "configured-ghcjs-src" {
|
||||
cabal-install
|
||||
gcc
|
||||
];
|
||||
|
||||
inherit ghcjsSrc;
|
||||
|
||||
ctimePatch = fetchpatch {
|
||||
name = "ghcjs-base-ctime-64-bit.patch";
|
||||
url = "https://github.com/ghcjs/ghcjs/commit/b7711fbca7c3f43a61f1dba526e6f2a2656ef44c.patch";
|
||||
hash = "sha256-zZ3l8/5gbIGtvu0s2Xl92fEDhkhJ2c2w+5Ql5qkvr3s=";
|
||||
};
|
||||
} ''
|
||||
export HOME=$(pwd)
|
||||
mkdir $HOME/.cabal
|
||||
@ -37,6 +43,8 @@ runCommand "configured-ghcjs-src" {
|
||||
chmod -R +w "$out"
|
||||
cd "$out"
|
||||
|
||||
patch -p1 -i "$ctimePatch"
|
||||
|
||||
# TODO: Find a better way to avoid impure version numbers
|
||||
sed -i 's/RELEASE=NO/RELEASE=YES/' ghc/configure.ac
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user