mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(users/flokli/keyboards/*): fix flash command

Browse source 
`qmk flash` disappeared from the `qmk` command itself.

See `qmk_cli/script_qmk.py`:

```
This program can be run from anywhere, with or without a qmk_firmware
repository. If a qmk_firmware repository can be located we will use that
to augment our available subcommands.
```

By pointing QMK_HOME to our firmware sources, we can make it re-appear.

Change-Id: I5348fff546e864773063fb1f712bf2abd198972e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11627
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: flokli <flokli@flokli.de>
This commit is contained in:
Florian Klink 2024-05-11 15:25:40 +03:00 committed by clbot
parent 37ddddc2e3
commit 2cdf8346a9
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
users/flokli/keyboards/dilemma/default.nix
View file

@ -1,16 +1,18 @@
{ depot, pkgs, ... }:
rec {
qmk_firmware_src = pkgs.fetchFromGitHub {
owner = "qmk";
repo = "qmk_firmware";
rev = "728aa576b0cd65c6fb7cf77132fdcd06fcedb643"; # develop branch
hash = "sha256-YmdX8nEsB1R8d265HAmvwejPjEHJdoTnm4QNigzrcyw=";
fetchSubmodules = true;
};
firmware = pkgs.stdenv.mkDerivation {
name = "keychron-bastardkb-dilemma-firmware";
src = pkgs.fetchFromGitHub {
owner = "qmk";
repo = "qmk_firmware";
rev = "728aa576b0cd65c6fb7cf77132fdcd06fcedb643"; # develop branch
hash = "sha256-YmdX8nEsB1R8d265HAmvwejPjEHJdoTnm4QNigzrcyw=";
fetchSubmodules = true;
};
src = qmk_firmware_src;
patches = [ ./enable-taps.patch ];
@ -38,7 +40,7 @@ rec {
};
flash = pkgs.writeShellScript "flash.sh" ''
${pkgs.qmk}/bin/qmk flash ${firmware}/bastardkb_dilemma_3x5_3_flokli.uf2
QMK_HOME=${qmk_firmware_src} ${pkgs.qmk}/bin/qmk flash ${firmware}/bastardkb_dilemma_3x5_3_flokli.uf2
'';
meta.ci.targets = [ "firmware" ];

18
users/flokli/keyboards/k6_pro/default.nix
View file

@ -1,16 +1,18 @@
{ depot, pkgs, ... }:
rec {
qmk_firmware_src = pkgs.fetchFromGitHub {
owner = "Keychron"; # the Keychron fork of qmk/qmk_firmware
repo = "qmk_firmware";
rev = "e0a48783e7cde92d1edfc53a8fff511c45e869d4"; # bluetooth_playground branch
hash = "sha256-Pk9kXktmej9JyvSt7UMEW2FDrBg7k1lOssh6HjrP5ro=";
fetchSubmodules = true;
};
firmware = pkgs.stdenv.mkDerivation {
name = "keychron-k6_pro-firmware";
src = pkgs.fetchFromGitHub {
owner = "Keychron"; # the Keychron fork of qmk/qmk_firmware
repo = "qmk_firmware";
rev = "e0a48783e7cde92d1edfc53a8fff511c45e869d4"; # bluetooth_playground branch
hash = "sha256-Pk9kXktmej9JyvSt7UMEW2FDrBg7k1lOssh6HjrP5ro=";
fetchSubmodules = true;
};
src = qmk_firmware_src;
nativeBuildInputs = [
pkgs.qmk
@ -32,7 +34,7 @@ rec {
};
flash = pkgs.writeShellScript "flash.sh" ''
${pkgs.qmk}/bin/qmk flash ${firmware}/keychron_k6_pro_ansi_rgb_flokli.bin
QMK_HOME=${qmk_firmware_src} ${pkgs.qmk}/bin/qmk flash ${firmware}/keychron_k6_pro_ansi_rgb_flokli.bin
'';
meta.ci.targets = [ "firmware" ];