From e3343bc80dc54416d4e8ee6a60a8e92b630810de Mon Sep 17 00:00:00 2001 From: Chris Wells Date: Sat, 18 Oct 2025 12:07:25 -0500 Subject: Some keyboards will build, but a number are having issues with -fPIC and -fPIE... --- keyboards/f77/default.nix | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) (limited to 'keyboards/f77/default.nix') diff --git a/keyboards/f77/default.nix b/keyboards/f77/default.nix index 4331637..4af837e 100644 --- a/keyboards/f77/default.nix +++ b/keyboards/f77/default.nix @@ -1,21 +1,36 @@ -{ pkgs, ... }: let +{ pkgs, lib, ... }: let base = { - firmware = { - type = "qmk"; + type = "qmk"; + qmk = { qmk_firmware = pkgs.qmk_firmware-modelf; + keyboard = { + name = "model_f_labs/f77"; + revision = "wcass"; + }; + build.flash = fw: '' + ${pkgs.dfu-util}/bin/dfu-util "${fw}.bin" + ''; }; - qmk.keyboard.name = "model_f_labs/f77"; }; in { devices = { "f77:default" = base; - "f77:me" = base // { + "f77" = lib.recursiveUpdate base { qmk.keymap = rec { name = "me"; - src = builtins.path { + src = pkgs.symlinkJoin { inherit name; - path = ./.; + paths = [ + (builtins.path { + inherit name; + path = ./.; + }) + (builtins.path { + name = "shared"; + path = ../shared; + }) + ]; }; }; }; -- cgit v1.2.3