From f49d58c611ffa94ff50b1f1399afd7d4652ac736 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 26 Mar 2026 06:28:04 +0000 Subject: [PATCH] xdg-desktop-portal.tests: fix the eval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the chnage the eval fails in `master` as: $ nix-instantiate -A xdg-desktop-portal.tests ... error: … while calling the 'derivationStrict' builtin at «nix-internal»/derivation-internal.nix:37:12: 36| 37| strict = derivationStrict drvAttrs; | ^ 38| … while evaluating derivation 'test-icon-validation' whose name attribute is located at pkgs/stdenv/generic/make-derivation.nix:536:13 … while evaluating attribute 'buildCommand' of derivation 'test-icon-validation' at pkgs/build-support/trivial-builders/default.nix:80:17: 79| enableParallelBuilding = true; 80| inherit buildCommand name; | ^ 81| passAsFile = [ "buildCommand" ] ++ (derivationArgs.passAsFile or [ ]); error: path 'pkgs/applications/audio/zynaddsubfx/ZynLogo.svg' does not exist --- pkgs/development/libraries/xdg-desktop-portal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 915ad886485c..0adeef13b04f 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -179,7 +179,7 @@ stdenv.mkDerivation (finalAttrs: { installedTests = nixosTests.installed-tests.xdg-desktop-portal; validate-icon = runCommand "test-icon-validation" { } '' - ${finalAttrs.finalPackage}/libexec/xdg-desktop-portal-validate-icon --ruleset=desktop --sandbox --path=${../../../applications/audio/zynaddsubfx/ZynLogo.svg} > "$out" + ${finalAttrs.finalPackage}/libexec/xdg-desktop-portal-validate-icon --ruleset=desktop --sandbox --path=${../../../by-name/zy/zynaddsubfx/ZynLogo.svg} > "$out" grep format=svg "$out" ''; };