bartvdbraak/dotfiles
1
0
Fork 0
mirror of https://github.com/bartvdbraak/dotfiles.git synced 2025-04-27 14:41:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Consolidate changes

Browse source
This commit is contained in:
Bart van der Braak 2024-10-26 17:04:57 +02:00
parent a7b77a4555
commit d619c52e04
3 changed files with 12 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tongfang/nixos/hardware-configuration.nix
View file

@ -5,7 +5,7 @@
let let
yt6801 = import ./yt6801/default.nix { yt6801 = import ./yt6801/default.nix {
inherit (pkgs) lib stdenv fetchzip nukeReferences bc; inherit (pkgs) lib stdenv fetchFromGitHub nukeReferences bc;
kernel = pkgs.linuxPackages.kernel; kernel = pkgs.linuxPackages.kernel;
}; };
in in

22
tongfang/nixos/yt6801/default.nix
View file

@ -1,17 +1,21 @@
{ lib, stdenv, fetchzip, nukeReferences, bc, kernel }: { lib, stdenv, fetchFromGitHub, nukeReferences, bc, kernel }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "yt6801"; pname = "yt6801";
version = "1.0.29"; version = "1.0.29";
name = "${pname}-${version}-${kernel.version}"; name = "${pname}-${version}-${kernel.version}";
src = fetchzip { src = fetchFromGitHub {
url = "https://www.motor-comm.com/Public/Uploads/uploadfile/files/20240812/yt6801-linux-driver-${version}.zip"; owner = "bartvdbraak";
sha256 = "sha256-oz6CeOUN6QWKXxe3WUZljhGDTFArsknjzBuQ4IchGeU="; repo = pname;
stripRoot = false; rev = version;
sha256 = "sha256-VEBwcbJcLffIIAP+NIhjiuMkfR+PKybBDnIbxY6zBMA=";
}; };
patches = [ "./src_makefile.patch" ]; patchPhase = ''
substituteInPlace ./src/Makefile \
--replace-fail 'KSRC_BASE = /lib/modules/$(shell uname -r)' "KSRC_BASE = ${KERNELDIR}"
'';
hardeningDisable = [ "pic" "format" ]; hardeningDisable = [ "pic" "format" ];
KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}"; KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}";
@ -20,17 +24,13 @@ stdenv.mkDerivation rec {
preBuild = "cd src"; preBuild = "cd src";
buildFlags = [ "modules" ]; buildFlags = [ "modules" ];
patchPhase = ''
substituteInPlace ./src/Makefile \
--replace-fail 'KSRC_BASE = /lib/modules/$(shell uname -r)' "KSRC_BASE = ${KERNELDIR}"
'';
makeFlags = [ makeFlags = [
"ARCH=${stdenv.hostPlatform.linuxArch}" "ARCH=${stdenv.hostPlatform.linuxArch}"
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"CROSS_COMPILE=${stdenv.cc.targetPrefix}" "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
]; ];
INSTALL_MOD_PATH = placeholder "out"; installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with lib; { meta = with lib; {

25
tongfang/nixos/yt6801/src_makefiles.patch
View file

@ -1,25 +0,0 @@
diff --git a/src/Makefile b/src/Makefile
index 9b29b47..552558e 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -32,20 +32,10 @@ modules:
make -C $(KSRC) M=$(PWD) modules
install:
- @echo "KFILE: " $(KFILE)
- @echo "KDST: " $(KDST)
make -C $(KSRC) M=$(PWD) INSTALL_MOD_DIR=$(KDST) modules_install
- sudo ls -l $(ko_dir)
- depmod $(shell uname -r)
- modprobe $(KFILE)
- @file $(ko_full)
- @echo install done.
- @modinfo $(ko_full)
uninstall:
- sudo ls -l $(ko_dir)
sudo rm $(ko_full)
- sudo ls -l $(ko_dir)
clean:
make -C $(KSRC) M=$(PWD) clean