diff --git a/pkgs/os-specific/linux/tuxedo-drivers/default.nix b/pkgs/os-specific/linux/tuxedo-drivers/default.nix index 7386e0b8ddf1..a9f579fb6154 100644 --- a/pkgs/os-specific/linux/tuxedo-drivers/default.nix +++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix @@ -7,22 +7,34 @@ kmod, pahole, gitUpdater, + udevCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "tuxedo-drivers-${kernel.version}"; - version = "4.14.0"; + version = "4.15.4"; src = fetchFromGitLab { group = "tuxedocomputers"; owner = "development/packages"; repo = "tuxedo-drivers"; rev = "v${finalAttrs.version}"; - hash = "sha256-79YZaK8WrHOxSUJWxi4lc+foh4xz3EgRnjw+OrL8yqU="; + hash = "sha256-WJeju+czbCw03ALW7yzGAFENCEAvDdKqHvedchd7NVY="; }; + patches = [ ./no-cp-etc-usr.patch ]; + + postInstall = '' + echo "Running postInstallhook" + install -Dm 0644 -t $out/etc/udev/rules.d usr/lib/udev/rules.d/* + ''; + buildInputs = [ pahole ]; - nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ + kmod + udevCheckHook + ] + ++ kernel.moduleBuildDependencies; makeFlags = kernelModuleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" @@ -30,6 +42,8 @@ stdenv.mkDerivation (finalAttrs: { "INSTALL_MOD_PATH=${placeholder "out"}" ]; + doInstallCheck = true; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch b/pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch new file mode 100644 index 000000000000..9e94a43d60c5 --- /dev/null +++ b/pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile b/Makefile +index 75a6bc1..6021d42 100644 +--- a/Makefile ++++ b/Makefile +@@ -30,7 +30,6 @@ all: + + install: all + make -C $(KDIR) M=$(PWD) $(MAKEFLAGS) modules_install +- cp -r etc usr / + + clean: + make -C $(KDIR) M=$(PWD) $(MAKEFLAGS) clean