yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cli: don't hardcode system for flash list

Browse Source
This commit is contained in:
Michael Hoang
2025-09-16 14:17:46 +02:00
parent 1f9b44a4ad
commit 2152646df6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/clan-cli/clan_lib/flash/list.py
View File

@@ -32,7 +32,7 @@ def get_machine_flash_options() -> FlashOptions:
def list_languages() -> list[str]: def list_languages() -> list[str]:
cmd = nix_build([f"{nixpkgs_source()}#legacyPackages.x86_64-linux.glibcLocales"]) cmd = nix_build([f"{nixpkgs_source()}#glibcLocales"])
result = run(cmd, RunOpts(log=Log.STDERR, error_msg="Failed to find glibc locales")) result = run(cmd, RunOpts(log=Log.STDERR, error_msg="Failed to find glibc locales"))
locale_file = Path(result.stdout.strip()) / "share" / "i18n" / "SUPPORTED" locale_file = Path(result.stdout.strip()) / "share" / "i18n" / "SUPPORTED"
@@ -57,7 +57,7 @@ def list_languages() -> list[str]:
def list_keymaps() -> list[str]: def list_keymaps() -> list[str]:
cmd = nix_build([f"{nixpkgs_source()}#legacyPackages.x86_64-linux.kbd"]) cmd = nix_build([f"{nixpkgs_source()}#kbd.out"])
result = run(cmd, RunOpts(log=Log.STDERR, error_msg="Failed to find kbdinfo")) result = run(cmd, RunOpts(log=Log.STDERR, error_msg="Failed to find kbdinfo"))
keymaps_dir = Path(result.stdout.strip()) / "share" / "keymaps" keymaps_dir = Path(result.stdout.strip()) / "share" / "keymaps"

4
pkgs/clan-cli/default.nix
View File

@@ -227,8 +227,8 @@ pythonRuntime.pkgs.buildPythonApplication {
../../nixosModules/clanCore/zerotier/generate.py ../../nixosModules/clanCore/zerotier/generate.py
# needed by flash list tests # needed by flash list tests
nixpkgs.legacyPackages.x86_64-linux.kbd pkgs.kbd
nixpkgs.legacyPackages.x86_64-linux.glibcLocales pkgs.glibcLocales
# Pre-built VMs for impure tests # Pre-built VMs for impure tests
pkgs.stdenv.drvPath pkgs.stdenv.drvPath