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/xd84pro/default.nix | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'keyboards/xd84pro') diff --git a/keyboards/xd84pro/default.nix b/keyboards/xd84pro/default.nix index 54b62c2..d254e33 100644 --- a/keyboards/xd84pro/default.nix +++ b/keyboards/xd84pro/default.nix @@ -1,17 +1,31 @@ -{ pkgs, ... }: let +{ pkgs, lib, ... }: let base = { - firmware.type = "qmk"; - qmk.keyboard.name = "xiudi/xd84pro"; + type = "qmk"; + qmk = { + keyboard.name = "xiudi/xd84pro"; + build.flash = fw: '' + ${pkgs.dfu-util}/bin/dfu-util "${fw}.bin" + ''; + }; }; in { devices = { - "xd87:default" = base; - "xd87:me" = base // { + "xd84pro:default" = base; + "xd84pro" = 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