From 3d517000bb5088987c2eef520d07b8bca3919607 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 17 Jun 2025 17:59:11 +0200 Subject: [PATCH] sage: refactor passthru on sage-env `writeTextFile` supports `passthru` today, so let's use it. The previous solution could cause eval errors in some obscure override scenarios - so obscure, that I can't provide a simple reproducer. But, I did hit it during some experimentation. --- pkgs/by-name/sa/sage/sage-env.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sa/sage/sage-env.nix b/pkgs/by-name/sa/sage/sage-env.nix index a480159d34c2..525b3a901722 100644 --- a/pkgs/by-name/sa/sage/sage-env.nix +++ b/pkgs/by-name/sa/sage/sage-env.nix @@ -102,6 +102,12 @@ in writeTextFile rec { name = "sage-env"; destination = "/${name}"; + + passthru = { + lib = sagelib; + docbuild = sage-docbuild; + }; + text = '' export PKG_CONFIG_PATH='${ @@ -205,8 +211,3 @@ writeTextFile rec { }''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" ''; } -// { - # equivalent of `passthru`, which `writeTextFile` doesn't support - lib = sagelib; - docbuild = sage-docbuild; -}