From 71be8884bb4a07269e30c3875621ddd3c6e449aa Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 19 Mar 2025 18:47:31 +0200 Subject: [PATCH 1/2] bluespec: Install `showrules` I don't know why this was missing but it's probably best to install all the `install-extra`. https://www.github.com/B-Lang-org/bsc/blob/65e3a87a17f6b9cf38cbb7b6ad7a4473f025c098/src/comp/Makefile#L359 --- pkgs/by-name/bl/bluespec/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix index 061b22ce330a..26d6b10f9cb4 100644 --- a/pkgs/by-name/bl/bluespec/package.nix +++ b/pkgs/by-name/bl/bluespec/package.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { src/comp/wrapper.sh substituteInPlace src/comp/Makefile \ - --replace-fail 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) install-utils' + --replace-fail 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) $(SHOWRULESEXES) install-utils install-showrules' # For darwin # ld: library not found for -ltcl8.5 From 814aeb0e32d29631ab157d37be8548b5586fa5ad Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 20 Mar 2025 02:49:54 +0200 Subject: [PATCH 2/2] bluespec: Support `x86_64-darwin` and `aarch64-linux` --- pkgs/by-name/bl/bluespec/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix index 26d6b10f9cb4..8a617c992502 100644 --- a/pkgs/by-name/bl/bluespec/package.nix +++ b/pkgs/by-name/bl/bluespec/package.nix @@ -172,12 +172,10 @@ stdenv.mkDerivation rec { homepage = "https://github.com/B-Lang-org/bsc"; license = lib.licenses.bsd3; platforms = [ + "aarch64-linux" "x86_64-linux" - "aarch64-darwin" - ]; + ] ++ lib.platforms.darwin; mainProgram = "bsc"; - # darwin fails at https://github.com/B-Lang-org/bsc/pull/35#issuecomment-583731562 - # aarch64 fails, as GHC fails with "ghc: could not execute: opt" maintainers = with lib.maintainers; [ jcumming thoughtpolice