Skip to content

Commit

Permalink
haskell.compiler.ghcjs: fix build (#228749)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
ncfavier authored May 2, 2023
1 parent e1edd81 commit 44f30ed
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions pkgs/development/compilers/ghcjs/8.10/configured-ghcjs-src.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
, gcc
, cabal-install
, runCommand
, lib
, stdenv
, fetchpatch

, ghc
, happy
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 44f30ed

Please sign in to comment.