From: Scott Worley <scottworley@scottworley.com>
Date: Fri, 29 Sep 2023 19:31:25 +0000 (-0700)
Subject: client: Use standard <nixpkgs>
X-Git-Tag: v0.1.0~76
X-Git-Url: http://git.scottworley.com/tattlekey/commitdiff_plain/9e4505536bfe3373b9097ca9e89167950b6a5cbb?ds=sidebyside;hp=661f51ad9c5a206f6d06b670c969d4cbd9c7b898

client: Use standard <nixpkgs>

Do the "fetchSubmodules = true;" override here
---

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 <nixpkgs> { }, }:
 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; }