eeva/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-12-24 10:39:44 +01:00
Code Issues Releases Wiki Activity

Merge pull request #218 from yorickvP/master

Browse source
This commit is contained in:
Jörg Thalheim 2020-12-25 17:46:30 +00:00 committed by GitHub
commit c242378e63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dell/xps/13-9360/default.nix
View file

@ -1,10 +1,6 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
{ {
# 4K screen, use bigger console font
# i18n.consoleFont deprecated and obsolete in >=20.03
# hardware-configuration.nix generates console.font
i18n.consoleFont = lib.mkIf (lib.versionOlder (lib.versions.majorMinor lib.version) "20.03") (lib.mkDefault "latarcyrheb-sun32");
imports = [ imports = [
../../../common/cpu/intel/kaby-lake ../../../common/cpu/intel/kaby-lake
../../../common/pc/laptop ../../../common/pc/laptop
@ -18,13 +14,6 @@
systemd-boot.enable = lib.mkDefault true; systemd-boot.enable = lib.mkDefault true;
}; };
hardware.firmware = lib.mkBefore [ pkgs.qca6174-firmware ];
# TODO: upstream to NixOS/nixpkgs
nixpkgs.overlays = [(final: previous: {
qca6174-firmware = final.callPackage ./qca6174-firmware.nix {};
})];
# This will save you money and possibly your life! # This will save you money and possibly your life!
services.thermald.enable = true; services.thermald.enable = true;
} }

26
dell/xps/13-9360/qca6174-firmware.nix
View file

@ -1,26 +0,0 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "${target}-firmware-${version}";
version = "${branch}-00042";
branch = "4.4.1.c1";
target = "QCA6174";
src = fetchurl {
url = "https://github.com/kvalo/ath10k-firmware/raw/952afa4949cb34193040cd4e7441e1aee50ac731/${target}/hw3.0/${branch}/firmware-6.bin_RM.${version}-QCARMSWP-1";
sha256 = "01vvz3qhqw5l3yilcqgk1spk4y9k4qy7na7a57cbl037r231szdh";
};
buildCommand = ''
install -D $src $out/lib/firmware/ath10k/${target}/hw3.0/firmware-6.bin
'';
meta = with stdenv.lib; {
description = "Updated firmware for the qca6174 wireless chip";
homepage = "https://github.com/kvalo/ath10k-firmware/tree/master/QCA6174/hw3.0";
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ yorickvp ];
platforms = platforms.linux;
};
}