Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		@@ -48,7 +48,7 @@ in
 | 
				
			|||||||
mkShell {
 | 
					mkShell {
 | 
				
			||||||
  name = "qmk-firmware";
 | 
					  name = "qmk-firmware";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  buildInputs = [ clang-tools dfu-programmer dfu-util diffutils git pythonEnv poetry niv ]
 | 
					  buildInputs = [ clang-tools dfu-programmer dfu-util diffutils git pythonEnv niv ]
 | 
				
			||||||
    ++ lib.optional avr [
 | 
					    ++ lib.optional avr [
 | 
				
			||||||
      pkgsCross.avr.buildPackages.binutils
 | 
					      pkgsCross.avr.buildPackages.binutils
 | 
				
			||||||
      pkgsCross.avr.buildPackages.gcc8
 | 
					      pkgsCross.avr.buildPackages.gcc8
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user