From 0e3810e1ec4388be2128e1cc0a1a2dcc97ccf463 Mon Sep 17 00:00:00 2001 From: markoburcul Date: Tue, 11 Mar 2025 13:50:42 +0100 Subject: [PATCH] nix: set default system nim Signed-off-by: markoburcul --- nix/default.nix | 7 +++++-- nix/shell.nix | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index 714399fd9..399883b60 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -4,7 +4,8 @@ src ? ../., targets ? ["libwaku-android-arm64"], verbosity ? 2, - useSystemNim ? false, + useSystemNim ? true, + quickAndDirty ? true, stableSystems ? [ "x86_64-linux" "aarch64-linux" ], @@ -61,10 +62,12 @@ in stdenv.mkDerivation rec { ANDROID_NDK_HOME="${pkgs.androidPkgs.ndk}"; NIMFLAGS = "-d:disableMarchNative -d:git_revision_override=${revision}"; XDG_CACHE_HOME = "/tmp"; - USE_SYSTEM_NIM = "1"; makeFlags = targets ++ [ "V=${toString verbosity}" + "QUICK_AND_DIRTY_COMPILER=${if quickAndDirty then "1" else "0"}" + "QUICK_AND_DIRTY_NIMBLE=${if quickAndDirty then "1" else "0"}" + "USE_SYSTEM_NIM=${if useSystemNim then "1" else "0"}" ]; configurePhase = '' diff --git a/nix/shell.nix b/nix/shell.nix index dd160ff35..3807a55cc 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -9,6 +9,7 @@ pkgs.mkShell { openssl which rustup + nim-unwrapped-2_0 docker cargo ] ++ lib.optionals stdenv.isDarwin [