add pkgs from NixOS/nixpkgs#255185

Signed-off-by: Maximilian Huber <[email protected]>
maxhbr · Jan 18, 2024 · fa8d479 · fa8d479
1 parent ccaed77
commit fa8d479
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/flake.nix b/flake.nix
@@ -226,7 +226,9 @@
           nrf-command-line-tools = pkgs.callPackage ./pkgs_from_pr_255185/nrf-command-line-tools { 
             segger-jlink = self.packages."${system}".segger-jlink;
           };
-          nrfconnect = pkgs.callPackage ./pkgs_from_pr_255185/nrfconnect { };
+          nrfconnect = pkgs.callPackage ./pkgs_from_pr_255185/nrfconnect { 
+            segger-jlink = self.packages."${system}".segger-jlink;
+          };
           segger-jlink = pkgs.callPackage ./pkgs_from_pr_255185/segger-jlink { };
         });
 
@@ -271,6 +273,7 @@
 
       nixosModules.zephyr = ({ config, lib, pkgs, ... }:
         let
+          inherit (pkgs.stdenv.hostPlatform) system;
           # platformio-udev-rules = pkgs.writeTextFile {
           #   name = "platformio-udev-rules";
           #   text = builtins.readFile
@@ -296,6 +299,8 @@
             # pkgs.segger-jlink
             pkgs.stlink
             pkgs.teensy-udev-rules
+
+            self.packages."${system}".segger-jlink
           ];
         });
 

diff --git a/pkgs_from_pr_255185/nrfconnect/default.nix b/pkgs_from_pr_255185/nrfconnect/default.nix
@@ -1,6 +1,7 @@
 { lib
 , fetchurl
 , appimageTools
+, segger-jlink
 }:
 
 let