From 1f1bdeff074bf5352e34df22a503329d86208003 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Fri, 25 Oct 2024 14:34:52 +0200 Subject: [PATCH] Change buildinputs and patch commands --- tongfang/nixos/yt6801-driver.nix | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/tongfang/nixos/yt6801-driver.nix b/tongfang/nixos/yt6801-driver.nix index 6247f37..84fade1 100644 --- a/tongfang/nixos/yt6801-driver.nix +++ b/tongfang/nixos/yt6801-driver.nix @@ -12,26 +12,25 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; + buildInputs = [ kernel.dev ]; hardeningDisable = [ "pic" "format" ]; - postPatch = '' - substituteInPlace ./yt_nic_install.sh \ - --replace "/lib/modules" "$out/lib/modules" \ - --replace "/sbin/depmod" "# depmod" - - substituteInPlace ./src/Makefile \ - --replace "/lib/modules" "$out/lib/modules/${kernel.modDirVersion}" \ - --replace "kernel/drivers/net/ethernet/motorcomm" "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/ethernet/motorcomm" - ''; - makeFlags = [ "ARCH=${stdenv.hostPlatform.linuxArch}" - ("KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build") - ("EXTRA_CFLAGS=-Wall -g -I${kernel.dev}/include") - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "EXTRA_CFLAGS=-Wall -I${kernel.dev}/include" ]; + postPatch = '' + substituteInPlace ./yt_nic_install.sh \ + --replace-quiet "/lib/modules" "$out/lib/modules/${kernel.modDirVersion}" \ + --replace-quiet "/sbin/depmod" "# depmod" + substituteInPlace ./src/Makefile \ + --replace-quiet "/lib/modules" "$out/lib/modules/${kernel.modDirVersion}" \ + --replace-quiet "KSRC_BASE = /lib/modules/$(shell uname -r)" \ + "KSRC_BASE = ${kernel.dev}/lib/modules/${kernel.modDirVersion}" + ''; + preInstall = '' mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/ethernet/motorcomm" '';