Compare commits

..

2 commits

Author SHA1 Message Date
Artturin 14d20e3101 flake: Fix bluespec bsc binary
Nixpkgs pr incoming
2025-04-18 18:57:54 +03:00
Artturin 71c938c912 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/d6973081434f88088e5321f83ebafe9a1167c367?narHash=sha256-cuNapx/uQeCgeuhUhdck3JKbgpsml259sjUQnWM7zW8%3D' (2025-01-02)
  → 'github:NixOS/nixpkgs/2bfc080955153be0be56724be6fa5477b4eefabb?narHash=sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ%2BVoVdg%3D' (2025-04-03)
2025-04-18 18:57:54 +03:00
2 changed files with 24 additions and 4 deletions

View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1744536153, "lastModified": 1743689281,
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "rev": "2bfc080955153be0be56724be6fa5477b4eefabb",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -34,7 +34,27 @@
# Versions can be checked with # Versions can be checked with
# `nix eval --json ".#riscv-bluespec-classic.nativeBuildInputs" | nix-shell -p jq --run jq` # `nix eval --json ".#riscv-bluespec-classic.nativeBuildInputs" | nix-shell -p jq --run jq`
nativeBuildInputs = [ nativeBuildInputs = [
bluespec (
(bluespec.override {
makeWrapper = prev.makeBinaryWrapper;
withDocs = false;
texliveFull = null;
asciidoctor = null;
}).overrideAttrs
{
doCheck = false;
postFixup = ''
# https://github.com/B-Lang-org/bsc/blob/65e3a87a17f6b9cf38cbb7b6ad7a4473f025c098/src/comp/bsc.hs#L1839
wrapProgram $out/bin/core/bsc \
--prefix PATH : ${
prev.lib.makeBinPath (
if stdenv.hostPlatform.isDarwin then [ prev.cctools ] else [ prev.targetPackages.stdenv.cc ]
)
}
'';
}
)
nextpnr nextpnr
openfpgaloader openfpgaloader
trellis trellis