Skip to content

Commit 0df9fd7

Browse files
committed
Remove node-lto overlay
1 parent d62e388 commit 0df9fd7

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
lines changed

compiler/ghc/default.nix

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ let
119119
INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
120120
'';
121121

122+
nodejs = buildPackages.nodejs_24;
123+
122124
libffi-wasm = buildPackages.runCommand "libffi-wasm" {
123125
nativeBuildInputs = [
124126
(buildPackages.haskell-nix.tool "ghc912" "libffi-wasm" {
@@ -599,7 +601,7 @@ haskell-nix.haskellLib.makeCompilerDeps (stdenv.mkDerivation (rec {
599601
'' + lib.optionalString (targetPlatform.isWasm) ''
600602
substituteInPlace utils/jsffi/dyld.mjs \
601603
--replace \
602-
"${buildPackages.nodejs-with-lto}/bin/node --disable-warning=ExperimentalWarning ${
604+
"${nodejs}/bin/node --disable-warning=ExperimentalWarning ${
603605
if builtins.compareVersions ghc-version "9.13" < 0
604606
then "--experimental-wasm-type-reflection"
605607
else "--max-old-space-size=65536"} --no-turbo-fast-api-calls --wasm-lazy-validation" \
@@ -608,7 +610,7 @@ haskell-nix.haskellLib.makeCompilerDeps (stdenv.mkDerivation (rec {
608610
shift
609611
LIB_WASM=$1
610612
shift
611-
exec ${buildPackages.nodejs-with-lto}/bin/node \
613+
exec ${nodejs}/bin/node \
612614
--disable-warning=ExperimentalWarning \
613615
${
614616
if builtins.compareVersions ghc-version "9.13" < 0
@@ -636,7 +638,7 @@ haskell-nix.haskellLib.makeCompilerDeps (stdenv.mkDerivation (rec {
636638
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
637639
] ++ lib.optional (patches != []) autoreconfHook
638640
++ lib.optional useLdLld llvmPackages.bintools
639-
++ lib.optional (targetPlatform.isWasm) buildPackages.nodejs-with-lto;
641+
++ lib.optional (targetPlatform.isWasm) nodejs;
640642

641643
# For building runtime libs
642644
depsBuildTarget = toolsForTarget;

overlays/default.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ let
9797
lazy-inputs = import ../lazy-inputs;
9898
rcodesign = import ./rcodesign.nix;
9999
wasm = import ./wasm.nix;
100-
node-lto = import ./node-lto.nix;
101100
};
102101

103102
composeExtensions = f: g: final: prev:
@@ -133,7 +132,6 @@ let
133132
gobject-introspection
134133
hix
135134
wasm
136-
node-lto
137135
# Restore nixpkgs haskell and haskellPackages
138136
(_: prev: { inherit (prev.haskell-nix-prev) haskell haskellPackages; })
139137
cacheCompilerDeps

overlays/node-lto.nix

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)