From 9e4505536bfe3373b9097ca9e89167950b6a5cbb Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Fri, 29 Sep 2023 12:31:25 -0700 Subject: [PATCH 1/1] client: Use standard Do the "fetchSubmodules = true;" override here --- client/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/client/default.nix b/client/default.nix index 58b928e..322cf66 100644 --- a/client/default.nix +++ b/client/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? import ~/devel/nixpkgs { }, }: +{ pkgs ? import { }, }: let cc = pkgs.pkgsCross.arm-embedded.stdenv.cc; tattlekey = { lib, stdenv, cmake, pico-sdk, python3 }: @@ -11,8 +11,20 @@ let "-DCMAKE_C_COMPILER=${cc}/bin/arm-none-eabi-cc" "-DCMAKE_CXX_COMPILER=${cc}/bin/arm-none-eabi-c++" "-DPICO_BOARD=pico_w" - "-DPICO_SDK_PATH=${pico-sdk.override { minimal = false; }}/lib/pico-sdk" + "-DPICO_SDK_PATH=${pico-sdk}/lib/pico-sdk" "-DPICO_TOOLCHAIN_PATH=${cc}/bin" ]; }; -in pkgs.callPackage tattlekey {} + + pico-sdk = pkgs.pico-sdk.overrideAttrs (old: rec { + version = "1.5.1"; + src = pkgs.fetchFromGitHub { + fetchSubmodules = true; + owner = "raspberrypi"; + repo = "pico-sdk"; + rev = version; + hash = "sha256-GY5jjJzaENL3ftuU5KpEZAmEZgyFRtLwGVg3W1e/4Ho="; + }; + }); + +in pkgs.callPackage tattlekey { inherit pico-sdk; } -- 2.44.1