From 6e33a28609b4cd6995c523ea6e2145b0783ebee4 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Fri, 2 Oct 2026 23:50:08 +0800
Subject: [PATCH] chore(blender): pin nixpkgs-blender and drop obsolete OIDN
 override

nixpkgs-blender tracked the nixpkgs master branch, so every `just up` re-bumped it and started a full Blender/CUDA source rebuild even though Blender stayed at 5.2.2 LTS. Pin it to a fixed rev so bumps are deliberate.

The OIDN cmake override is obsolete: nixpkgs#545542 made setupCudaHook add nvcc to CUDAToolkit_ROOT, fixing the CMake 4.3+ split-root failure (nixpkgs#544701). Dropping it also stops Blender's derivation from depending on nixpkgs-stable.
---
 flake.lock          | 2 +-
 flake.nix           | 6 ++++--
 outputs/default.nix | 7 -------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 82dcce00..8b1a8052 100644
--- a/flake.lock
+++ b/flake.lock
@@ -627,8 +627,8 @@
       },
       "original": {
         "owner": "nixos",
-        "ref": "master",
         "repo": "nixpkgs",
+        "rev": "4b8338e3113dc41bcf7695f56dc372107b7ff4c9",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index 72635694..d66e6b36 100644
--- a/flake.nix
+++ b/flake.nix
@@ -108,8 +108,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # Track Blender from master while keeping its lock entry independent from regular nixpkgs.
-    nixpkgs-blender.url = "github:nixos/nixpkgs/master";
+    # Pinned nixpkgs for Blender (5.2 LTS + CUDA/OptiX).  Keeping it on a fixed
+    # rev stops `just up` from re-bumping this input and triggering a full
+    # Blender/CUDA source rebuild; bump the rev deliberately when needed.
+    nixpkgs-blender.url = "github:nixos/nixpkgs/4b8338e3113dc41bcf7695f56dc372107b7ff4c9";
 
     nixos-apple-silicon = {
       url = "github:nix-community/nixos-apple-silicon";
diff --git a/outputs/default.nix b/outputs/default.nix
index 4b66723b..a456b29e 100644
--- a/outputs/default.nix
+++ b/outputs/default.nix
@@ -53,13 +53,6 @@ let
           # for unrelated GPU architectures.
           cudaCapabilities = [ "8.9" ];
         };
-        overlays = lib.optional (system == "x86_64-linux") (
-          _: prev: {
-            # CMake 4.2+ breaks OIDN's nested CUDA build with nixpkgs' split CUDAToolkit_ROOT.
-            # https://github.com/NixOS/nixpkgs/issues/544701
-            openimagedenoise = prev.openimagedenoise.override { cmake = pkgs-stable.cmake; };
-          }
-        );
       };
 
       pkgs-x64 = import nixpkgs {