From 8e336972f0afb2fc4c857f49f66f892a6f8c8169 Mon Sep 17 00:00:00 2001 From: umbrageodotus Date: Sat, 18 Oct 2025 20:21:37 +0100 Subject: [PATCH 1/5] Switch to kernel.stdenv.mkDerivation for package --- nix/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nix/package.nix b/nix/package.nix index 0f5eec3..afcf540 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -2,7 +2,6 @@ pkgs @ { lib, bash, - stdenv, coreutils, writeShellScript, makeDesktopItem, @@ -15,7 +14,7 @@ let mkPackage = overrides @ { kernel, ... - }: (stdenv.mkDerivation rec { + }: (kernel.stdenv.mkDerivation rec { pname = "yeetmouse"; version = shortRev; src = lib.fileset.toSource { From 162fac12f9e3d7a19afec5eeb4bbdd8123b9eb4a Mon Sep 17 00:00:00 2001 From: umbrageodotus Date: Sat, 18 Oct 2025 20:24:15 +0100 Subject: [PATCH 2/5] Update package.nix --- nix/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nix/package.nix b/nix/package.nix index afcf540..3675339 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -1,7 +1,8 @@ { shortRev ? "dev" }: -pkgs @ { +pkgs @ rec { lib, bash, + stdenv ? kernel.stdenv, coreutils, writeShellScript, makeDesktopItem, @@ -14,7 +15,7 @@ let mkPackage = overrides @ { kernel, ... - }: (kernel.stdenv.mkDerivation rec { + }: (stdenv.mkDerivation rec { pname = "yeetmouse"; version = shortRev; src = lib.fileset.toSource { From a87d1ab2dd435c0a2a4a581ff44bc9ee7f33a607 Mon Sep 17 00:00:00 2001 From: umbrageodotus Date: Sat, 18 Oct 2025 20:25:55 +0100 Subject: [PATCH 3/5] Refactor package.nix to use kernelModuleMakeFlags --- nix/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nix/package.nix b/nix/package.nix index 3675339..6de8cb2 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -1,8 +1,7 @@ { shortRev ? "dev" }: -pkgs @ rec { +pkgs { lib, bash, - stdenv ? kernel.stdenv, coreutils, writeShellScript, makeDesktopItem, @@ -15,7 +14,7 @@ let mkPackage = overrides @ { kernel, ... - }: (stdenv.mkDerivation rec { + }: (kernelModuleMakeFlags.stdenv.mkDerivation rec { pname = "yeetmouse"; version = shortRev; src = lib.fileset.toSource { @@ -30,7 +29,7 @@ let copyDesktopItems ]; buildInputs = [ - stdenv.cc.cc.lib + kernelModuleMakeFlags.stdenv.cc.cc.lib pkgs.glfw3 ]; From ed9927648ec879b74a1e74bd799fe2e7a2a32fa9 Mon Sep 17 00:00:00 2001 From: umbrageodotus Date: Sat, 18 Oct 2025 20:26:29 +0100 Subject: [PATCH 4/5] Refactor package.nix to use attribute set syntax --- nix/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/package.nix b/nix/package.nix index 6de8cb2..edcd95d 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -1,5 +1,5 @@ { shortRev ? "dev" }: -pkgs { +pkgs @ { lib, bash, coreutils, From 20c193cdb1cdb205c96ebcb0d5317a030342e7bb Mon Sep 17 00:00:00 2001 From: umbrageodotus Date: Sat, 18 Oct 2025 20:27:54 +0100 Subject: [PATCH 5/5] Refactor package.nix to use kernel.stdenv --- nix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/package.nix b/nix/package.nix index edcd95d..6ae9066 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -14,7 +14,7 @@ let mkPackage = overrides @ { kernel, ... - }: (kernelModuleMakeFlags.stdenv.mkDerivation rec { + }: (kernel.stdenv.mkDerivation rec { pname = "yeetmouse"; version = shortRev; src = lib.fileset.toSource { @@ -29,7 +29,7 @@ let copyDesktopItems ]; buildInputs = [ - kernelModuleMakeFlags.stdenv.cc.cc.lib + kernel.stdenv.cc.cc.lib pkgs.glfw3 ];