From 0bec573eb36841d0ebdc5080b8b635d313ef5939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Tue, 19 May 2020 20:15:41 +0200 Subject: [PATCH] nix: don't use gradle to patch node modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before in order to create `deps.nodejs-patched` the `deps.gradle` would also have to be downloaded in order to patch `build.gradle` files with path to the Gradle dependencies in Nix store. It turns out just replacting lines referencing `mavenCentral()`, `google()`, and `jcenter()` in `repositories` block is enough to make Gradle properly fetch dependencies from repo provided via the command line `-Dmaven.repo.local='${deps.gradle}` option. This should reduce the required size for shells that don't use Gradle. Signed-off-by: Jakub SokoĊ‚owski --- nix/deps/nodejs-patched/default.nix | 2 +- nix/mobile/android/release.nix | 2 +- nix/pkgs/patch-maven-srcs/default.nix | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nix/deps/nodejs-patched/default.nix b/nix/deps/nodejs-patched/default.nix index 263eba27e7..349ea5787a 100644 --- a/nix/deps/nodejs-patched/default.nix +++ b/nix/deps/nodejs-patched/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { cp -r ${deps.nodejs}/node_modules/$moduleName ./node_modules/ chmod u+w -R ./node_modules/$moduleName fi - ${patchMavenSources} $modBuildGradle '${deps.gradle}' + ${patchMavenSources} $modBuildGradle done patchShebangs ./node_modules diff --git a/nix/mobile/android/release.nix b/nix/mobile/android/release.nix index 0692730a97..3894cbedcf 100644 --- a/nix/mobile/android/release.nix +++ b/nix/mobile/android/release.nix @@ -105,7 +105,7 @@ in stdenv.mkDerivation rec { chmod +w -R ./node_modules # Patch build.gradle to use local repo - ${patchMavenSources} ./android/build.gradle ${deps.gradle} + ${patchMavenSources} ./android/build.gradle ''; secretPhase = optionalString (secretsFile != "") '' source "${secretsFile}" diff --git a/nix/pkgs/patch-maven-srcs/default.nix b/nix/pkgs/patch-maven-srcs/default.nix index 1c63952bf6..3f75f440d5 100644 --- a/nix/pkgs/patch-maven-srcs/default.nix +++ b/nix/pkgs/patch-maven-srcs/default.nix @@ -14,13 +14,9 @@ writeScript "patch-maven-srcs" ('' } gradleFile="$1" - derivation="$2" # Some of those find something, some don't, that's fine. patchMavenSource "$gradleFile" 'mavenCentral()' 'mavenLocal()' patchMavenSource "$gradleFile" 'google()' 'mavenLocal()' patchMavenSource "$gradleFile" 'jcenter()' 'mavenLocal()' - patchMavenSource "$gradleFile" 'https://maven.google.com' "$derivation" - patchMavenSource "$gradleFile" 'https://www.jitpack.io' "$derivation" - patchMavenSource "$gradleFile" 'https://jitpack.io' "$derivation" '')