diff --git a/tongfang/nixos/hardware-configuration.nix b/tongfang/nixos/hardware-configuration.nix index 820a6f8..f928f09 100644 --- a/tongfang/nixos/hardware-configuration.nix +++ b/tongfang/nixos/hardware-configuration.nix @@ -6,7 +6,8 @@ let yt6801Overlay = (final: prev: { yt6801-driver = import ./yt6801-driver.nix { - inherit (pkgs) lib stdenv fetchurl kernel bc nukeReferences; + inherit (pkgs) lib stdenv fetchFromGitHub nukeReferences bc; + kernel = pkgs.linuxPackages.kernel; }; }); in @@ -20,7 +21,6 @@ in boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ pkgs.yt6801-driver ]; - environment.systemPackages = with pkgs; [ yt6801-driver ]; fileSystems."/" = { device = "/dev/disk/by-uuid/c7cf28c3-5744-45cc-8a81-456d24e44b7a"; diff --git a/tongfang/nixos/yt6801-driver.nix b/tongfang/nixos/yt6801-driver.nix index 1e94d0d..6247f37 100644 --- a/tongfang/nixos/yt6801-driver.nix +++ b/tongfang/nixos/yt6801-driver.nix @@ -1,15 +1,17 @@ -{ lib, stdenv, fetchurl, kernel, bc, nukeReferences }: +{ lib, stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: stdenv.mkDerivation rec { - pname = "yt6801-driver"; - version = "${kernel.version}-unstable-2024-10-25"; + pname = "yt6801"; + version = "1.0.29"; - src = fetchurl { - url = "https://www.motor-comm.com/Public/Uploads/uploadfile/files/20240812/yt6801-linux-driver-1.0.29.zip"; - sha256 = "1r8r463y140vrkilkciba16864cfcm35kdqpby50bs8dwmw84gm3"; + src = fetchFromGitHub { + owner = "bartvdbraak"; + repo = pname; + rev = "ea9c2d01c0f2a4171a774527dce4daca43e11956"; + hash = "sha256-oz6CeOUN6QWKXxe3WUZljhGDTFArsknjzBuQ4IchGeU="; }; - nativeBuildInputs = [ stdenv.lib.makeWrapper bc nukeReferences ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; hardeningDisable = [ "pic" "format" ]; postPatch = ''