From 3369061e8e51db3dec29ff132d35c5fbf3b44614 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sun, 3 Mar 2024 19:40:04 -0500 Subject: [PATCH] blender: inline single-use vars when defining withPackages --- pkgs/applications/misc/blender/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index c468341df51e..fb62ac711450 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -85,8 +85,6 @@ let pythonPackages = python310Packages; inherit (pythonPackages) python; - buildEnv = callPackage ./wrapper.nix { }; - libdecor' = libdecor.overrideAttrs (old: { # Blender uses private APIs, need to patch to expose them patches = (old.patches or [ ]) ++ [ ./libdecor.patch ]; @@ -323,12 +321,9 @@ stdenv.mkDerivation (finalAttrs: { withPackages = f: - let - packages = f pythonPackages; - in - buildEnv.override { + (callPackage ./wrapper.nix { }).override { blender = finalAttrs.finalPackage; - extraModules = packages; + extraModules = (f pythonPackages); }; tests = {