diff options
Diffstat (limited to 'modules/qmk.nix')
| -rw-r--r-- | modules/qmk.nix | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/modules/qmk.nix b/modules/qmk.nix index 6288d7e..c083b06 100644 --- a/modules/qmk.nix +++ b/modules/qmk.nix @@ -72,24 +72,16 @@ in { in pkgs.stdenv.mkDerivation { name = "qmk:${config.qmk.keyboard._path}:${config.qmk.keymap.name}"; src = config.qmk.qmk_firmware; - # { - # name = "qmk_firmware"; - # src = config.qmk.qmk_firmware; - # } - # ] ++ lib.optional (ksrc != null) { - # name = "keymap"; - # src = ksrc; - # }; - # - # sourceRoot = "qmk_firmware"; + + # hardeningDisable = [ "pic" "pie" ]; nativeBuildInputs = [ pkgs.qmk ]; - dontFixup = true; + # dontFixup = true; - preConfigure = lib.optionalString (ksrc != null) '' + preBuild = lib.optionalString (ksrc != null) '' mkdir -pv "${config.qmk.keymap._path}" cp -v "${ksrc}"/* "${config.qmk.keymap._path}" ''; @@ -98,8 +90,11 @@ in { # SKIP_GIT=true BUILD_DIR=build \ # make "${config.qmk.keyboard._path}:${config.qmk.keymap.name}" qmk compile \ - --env SKIP_GIT=true \ + --env SKIP_GIT=yes \ --env BUILD_DIR=build \ + --env SKIP_VERSION=yes \ + --env VERBOSE=true \ + --env ALLOW_WARNINGS=yes \ --keyboard "${config.qmk.keyboard._path}" \ --keymap "${config.qmk.keymap.name}" ''; |