Commit 731953b
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -7,7 +7,7 @@ | |||
| 7 | 7 | nodejs-slim_latest, | |
| 8 | 8 | icu, | |
| 9 | 9 | ||
| 10 | - buildInputs ? [ icu ], | ||
| 10 | + buildInputs ? lib.optional (icu != null) icu, | ||
| 11 | 11 | configureFlags ? [ | |
| 12 | 12 | ( | |
| 13 | 13 | if icu == null then | |
@@ -61,8 +61,6 @@ stdenv.mkDerivation (finalAttrs: { | |||
| 61 | 61 | ../../tools/getmoduleversion.py | |
| 62 | 62 | ../../tools/getnapibuildversion.py | |
| 63 | 63 | ../../tools/gyp_node.py | |
| 64 | - ../../tools/icu/icu_versions.json | ||
| 65 | - ../../tools/icu/icu-system.gyp | ||
| 66 | 64 | ../../tools/utils.py | |
| 67 | 65 | ../../tools/v8_gypfiles/abseil.gyp | |
| 68 | 66 | ../../tools/v8_gypfiles/features.gypi | |
@@ -73,6 +71,10 @@ stdenv.mkDerivation (finalAttrs: { | |||
| 73 | 71 | ../../tools/v8_gypfiles/toolchain.gypi | |
| 74 | 72 | ../../tools/v8_gypfiles/v8.gyp | |
| 75 | 73 | ] | |
| 74 | + ++ lib.optionals (icu != null) [ | ||
| 75 | + ../../tools/icu/icu_versions.json | ||
| 76 | + ../../tools/icu/icu-system.gyp | ||
| 77 | + ] | ||
| 76 | 78 | ++ lib.optionals (icu == "small") [ | |
| 77 | 79 | ../../deps/icu-small | |
| 78 | 80 | ../../tools/icu/current_ver.dep | |
@@ -102,6 +104,12 @@ stdenv.mkDerivation (finalAttrs: { | |||
| 102 | 104 | # We need to remove the node_inspector.gypi ref so GYP does not search for it. | |
| 103 | 105 | postPatch = '' | |
| 104 | 106 | substituteInPlace node.gyp --replace-fail "'includes' : [ 'src/inspector/node_inspector.gypi' ]" "'includes' : []" | |
| 107 | + '' | ||
| 108 | + + lib.optionalString (icu == null) '' | ||
| 109 | + substituteInPlace configure.py \ | ||
| 110 | + --replace-fail \ | ||
| 111 | + "icu_versions = json.loads((tools_path / 'icu' / 'icu_versions.json').read_text(encoding='utf-8'))" \ | ||
| 112 | + "icu_versions = { 'minimum_icu': 1 }" | ||
| 105 | 113 | ''; | |
| 106 | 114 | ||
| 107 | 115 | inherit configureScript configureFlags buildInputs; | |
0 commit comments