From b39cd95424e4fa46af12878cfe4fb71bd66e8ad7 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sat, 29 Mar 2025 23:05:36 -0700 Subject: [PATCH] llvmPackages_{12,13,14,15,16,17,18,19,20,git}.compiler-rt: use final attrs --- .../compilers/llvm/common/compiler-rt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index 3c07e8c5ab0a..b86486ed38b2 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -68,11 +68,11 @@ let src; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { inherit pname version; src = src'; - sourceRoot = "${src'.name}/${baseName}"; + sourceRoot = "${finalAttrs.src.name}/${baseName}"; patches = lib.optional (lib.versionOlder release_version "15") (getVersionFile "compiler-rt/codesign.patch") # Revert compiler-rt commit that makes codesign mandatory @@ -369,4 +369,4 @@ stdenv.mkDerivation { # `enable_execute_stack.c` Also doesn't sound like something WASM would support. || (stdenv.hostPlatform.isWasm && haveLibc); }; -} +})