From 5b68cf1f0456b73773c6f3dfd1939bb3639cf4f7 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Sun, 12 Jan 2025 14:55:16 +0800 Subject: [PATCH] nixos/programs/blender: update addons build step The previous one just overwrites existing directories from previous paths if there's any similar directory. --- modules/nixos/programs/blender.nix | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/modules/nixos/programs/blender.nix b/modules/nixos/programs/blender.nix index 16351b54..56abcdfc 100644 --- a/modules/nixos/programs/blender.nix +++ b/modules/nixos/programs/blender.nix @@ -7,21 +7,12 @@ let let blenderVersion = lib.versions.majorMinor cfg.package.version; in - pkgs.runCommand "blender-system-resources" - { - passAsFile = [ "paths" ]; - paths = cfg.addons ++ [ cfg.package ]; - nativeBuildInputs = with pkgs; [ outils ]; - } '' - mkdir -p $out - for i in $(cat $pathsPath); do - resourcesPath="$i/share/blender" - if [ -d $i/share/blender/${blenderVersion} ]; then - resourcesPath="$i/share/blender/${blenderVersion}"; - fi - lndir -silent $resourcesPath $out - done - ''; + pkgs.symlinkJoin { + name = "blender-${blenderVersion}-addons"; + paths = let + _paths = cfg.addons ++ [ cfg.package ]; + in lib.concatMap (p: [ "${p}/share/blender" ]) _paths; + }; in { options.programs.blender = {