Skip to content

nix: Remove (re)definition of KBUILD_OUTPUT from package.nix #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
delet-this wants to merge 4 commits into
base: master
Choose a base branch
from
Open

nix: Remove (re)definition of KBUILD_OUTPUT from package.nix #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b82cc5
Use callPackage
delet-this Apr 14, 2026
010e0bc
Use `config.boot.linuxPackages.callPackage` in the kernel module
delet-this Apr 14, 2026
2204086
Remove `KBUILD_OUTPUT` definition
delet-this Apr 14, 2026
f237ceb
Remove default values for `kernel` and `kernelModuleMakeFlags`
delet-this Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions nix/flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,23 @@

outputs = inputs @ { self, nixpkgs }: let
inherit (inputs.nixpkgs) lib;
packageInputs = {
shortRev = if (self ? shortRev) then self.shortRev else self.dirtyRev;
shortRev = if (self ? shortRev) then self.shortRev else self.dirtyRev;
packageInputs = pkgs: {
inherit shortRev;
inherit (pkgs.linuxPackages) kernel kernelModuleMakeFlags;
};
eachSystem = lib.genAttrs ["aarch64-linux" "x86_64-linux"];
overlay = final: prev: {
yeetmouse = import ./package.nix packageInputs final;
yeetmouse = final.callPackage import ./package.nix (packageInputs final);
};
in {
inherit inputs;
nixosModules.default = import ./module.nix overlay;
nixosModules.default = import ./module.nix shortRev;
overlays.default = overlay;
packages = eachSystem (system: {
yeetmouse = (import ./package.nix packageInputs nixpkgs.legacyPackages.${system});
packages = eachSystem (system: let
pkgs = nixpkgs.legacyPackages.${system};
in {
yeetmouse = pkgs.callPackage ./package.nix (packageInputs pkgs);
});
};
}
8 changes: 2 additions & 6 deletions nix/module.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
yeetmouseOverlay:
shortRev:
{ pkgs, config, lib, ... }:

with lib;
Expand Down Expand Up @@ -462,9 +462,7 @@ let
};
};

yeetmouse = pkgs.yeetmouse.override {
kernel = config.boot.kernelPackages.kernel;
};
yeetmouse = config.boot.kernelPackages.callPackage ./package.nix { inherit shortRev; };
in {
options.hardware.yeetmouse = {
enable = mkOption {
Expand Down Expand Up @@ -588,8 +586,6 @@ in {
};

config = mkIf cfg.enable {
nixpkgs.overlays = [ yeetmouseOverlay ];

boot.extraModulePackages = [ yeetmouse ];
environment.systemPackages = [ yeetmouse ];
services.udev = {
Expand Down
13 changes: 5 additions & 8 deletions nix/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
{ shortRev ? "dev" }:
pkgs @ {
{
lib,
bash,
stdenv,
coreutils,
writeShellScript,
makeDesktopItem,
kernel ? pkgs.linuxPackages.kernel,
kernelModuleMakeFlags ? pkgs.linuxPackages.kernelModuleMakeFlags,
...
pkgs,
kernel,
kernelModuleMakeFlags,
shortRev ? "dev"
}:

let
Expand Down Expand Up @@ -36,7 +34,6 @@ let
];

makeFlags = kernelModuleMakeFlags ++ [
"KBUILD_OUTPUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"-C"
"${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"M=$(sourceRoot)/driver"
Expand Down
Loading