feat(gs/keyboard): Integrate my layout with the depot
Integrate the keyboard layout for my Ergodox EZ, which is a layout for QMK, with the depot, including exposing several cross-compilation packages necessary to compile qmk for avr in third_party. Change-Id: Idd43169a0a3cf0be2bd1a578fdaff70388a58bfc Reviewed-on: https://cl.tvl.fyi/c/depot/+/947 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
parent
aae3d25234
commit
9ec0f4d0c8
4 changed files with 32 additions and 12 deletions
|
@ -101,5 +101,6 @@ in lib.fix (self: {
|
|||
glittershark = with depot.users.glittershark; [
|
||||
(systemFor system.system.chupacabra)
|
||||
xanthous
|
||||
keyboard.layout
|
||||
];
|
||||
})
|
||||
|
|
7
third_party/default.nix
vendored
7
third_party/default.nix
vendored
|
@ -36,6 +36,8 @@ let
|
|||
age
|
||||
autoconf
|
||||
autoreconfHook
|
||||
avrlibc
|
||||
avrdude
|
||||
awscli
|
||||
bashInteractive
|
||||
bat
|
||||
|
@ -58,6 +60,9 @@ let
|
|||
coreutils
|
||||
cudatoolkit
|
||||
darwin
|
||||
dfu-programmer
|
||||
dfu-util
|
||||
diffutils
|
||||
dockerTools
|
||||
execline
|
||||
fetchFromGitHub
|
||||
|
@ -106,6 +111,7 @@ let
|
|||
pandoc
|
||||
parallel
|
||||
pkgconfig
|
||||
pkgsCross
|
||||
postgresql
|
||||
pounce
|
||||
pulseaudio
|
||||
|
@ -128,6 +134,7 @@ let
|
|||
symlinkJoin
|
||||
systemd
|
||||
tdlib
|
||||
teensy-loader-cli
|
||||
terraform_0_12
|
||||
texlive
|
||||
thttpd
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
{ nixpkgs ? import <nixpkgs> {}
|
||||
}:
|
||||
{ pkgs, ... }:
|
||||
|
||||
with nixpkgs;
|
||||
with pkgs;
|
||||
|
||||
let avrlibc = pkgsCross.avr.libcCross; in
|
||||
|
||||
rec {
|
||||
qmkSource = fetchgit {
|
||||
|
@ -11,18 +12,29 @@ rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
qmk = import "${qmkSource}/shell.nix" {
|
||||
avr = true;
|
||||
teensy = true;
|
||||
arm = false;
|
||||
};
|
||||
|
||||
layout = stdenv.mkDerivation {
|
||||
layout = stdenv.mkDerivation rec {
|
||||
name = "ergodox_ez_grfn.hex";
|
||||
|
||||
src = qmkSource;
|
||||
|
||||
inherit (qmk) buildInputs AVR_CFLAGS AVR_ASFLAGS;
|
||||
buildInputs = [
|
||||
dfu-programmer
|
||||
dfu-util
|
||||
diffutils
|
||||
git
|
||||
python3
|
||||
pkgsCross.avr.buildPackages.binutils
|
||||
pkgsCross.avr.buildPackages.gcc8
|
||||
avrlibc
|
||||
avrdude
|
||||
];
|
||||
|
||||
AVR_CFLAGS = [
|
||||
"-isystem ${avrlibc}/avr/include"
|
||||
"-L${avrlibc}/avr/lib/avr5"
|
||||
];
|
||||
|
||||
AVR_ASFLAGS = AVR_CFLAGS;
|
||||
|
||||
patches = [ ./increase-tapping-delay.patch ];
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
#!/usr/bin/env bash
|
||||
exec "$(nix-build --no-out-link . -A flash)"
|
||||
exec "$(nix-build --no-out-link ../../.. -A users.glittershark.keyboard.flash)"
|
||||
|
|
Loading…
Reference in a new issue