From 5d4fb382a8f1633162df3a29fb0a66f261ec2039 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sun, 11 May 2025 22:21:07 +0000 Subject: [PATCH] (zilch lang ninja build): use more descriptive drv names If the description isn't set, it will use the command to execute instead. Change-Id: I6a6a6964105e2ad7532a601a8d7509bddea845ba --- lang/ninja/src/build.sld | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/ninja/src/build.sld b/lang/ninja/src/build.sld index c2fdb26..8f3f31e 100644 --- a/lang/ninja/src/build.sld +++ b/lang/ninja/src/build.sld @@ -59,7 +59,7 @@ (define (make-valid-store-path-string str) (if (string=? "" str) "zilch-ninja" - (string-map (lambda (c) (if (is-valid-store-path-char c) c #\-)) (if (> (string-length str) 211) (string-copy str 0 211) str)))) + (string-map (lambda (c) (if (is-valid-store-path-char c) c #\-)) (if (> (string-length str) 128) (string-copy str 0 128) str)))) ;; Returns a derivation that runs the command for this edge, ;; inside a Nix derivation with the correct inputs. @@ -219,7 +219,7 @@ (define outpath (cdar (store-path-for-ca-drv* - (make-valid-store-path-string (build-rule-description resolved)) + (make-valid-store-path-string (if (string=? (build-rule-description resolved) "") (build-rule-command resolved) (build-rule-description resolved))) "x86_64-linux" '("/bin/sh" "-c" "exec /bin/sh $ZILCH_CMDPath") `(("ZILCH_CMD" . ,command) ("passAsFile" . "ZILCH_CMD") . ,(ninja-build-config-environment (build-env-config env)))