From 9f84b1eab56e8784fd12d999c1ace191eccbf2b0 Mon Sep 17 00:00:00 2001 From: blokyk Date: Sat, 20 Dec 2025 00:40:04 +0000 Subject: [PATCH 1/2] yosys: set meta.mainProgram to "yosys" --- pkgs/by-name/yo/yosys/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/yo/yosys/package.nix b/pkgs/by-name/yo/yosys/package.nix index 477b3cebdfa4..bd4d637727c6 100644 --- a/pkgs/by-name/yo/yosys/package.nix +++ b/pkgs/by-name/yo/yosys/package.nix @@ -196,6 +196,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/YosysHQ/yosys/releases/tag/v${finalAttrs.version}"; license = lib.licenses.isc; platforms = lib.platforms.all; + mainProgram = "yosys"; maintainers = with lib.maintainers; [ shell thoughtpolice From d47b689711978eb1a29ddcf55e9bd711cf981bcb Mon Sep 17 00:00:00 2001 From: blokyk Date: Sat, 20 Dec 2025 01:18:30 +0000 Subject: [PATCH 2/2] glasgow,mcy: use getExe to get yosy bin path --- pkgs/by-name/gl/glasgow/package.nix | 2 +- pkgs/by-name/mc/mcy/package.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glasgow/package.nix b/pkgs/by-name/gl/glasgow/package.nix index 56133af24a68..a84b81799ce0 100644 --- a/pkgs/by-name/gl/glasgow/package.nix +++ b/pkgs/by-name/gl/glasgow/package.nix @@ -99,7 +99,7 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs = [ "--set" "YOSYS" - "${yosys}/bin/yosys" + (lib.getExe yosys) "--set" "ICEPACK" "${icestorm}/bin/icepack" diff --git a/pkgs/by-name/mc/mcy/package.nix b/pkgs/by-name/mc/mcy/package.nix index e2d6031e9b4e..e54d9a44788e 100644 --- a/pkgs/by-name/mc/mcy/package.nix +++ b/pkgs/by-name/mc/mcy/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation { patchShebangs . substituteInPlace mcy.py \ - --replace yosys '${yosys}/bin/yosys' \ + --replace yosys '${lib.getExe yosys}' \ --replace 'os.execvp("mcy-dash"' "os.execvp(\"$out/bin/mcy-dash\"" substituteInPlace mcy-dash.py \ --replace 'app.run(debug=True)' 'app.run(host="0.0.0.0",debug=True)' \ --replace 'subprocess.Popen(["mcy"' "subprocess.Popen([\"$out/bin/mcy\"" substituteInPlace scripts/create_mutated.sh \ - --replace yosys '${yosys}/bin/yosys' + --replace yosys '${lib.getExe yosys}' ''; # the build needs a bit of work...