nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 07:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #289011 from wegank/spike-gcc-13

Browse Source 
spike: unpin gcc12
This commit is contained in:
Weijia Wang 2024-02-15 20:42:40 +01:00 committed by GitHub
commit b2b6f1febe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/virtualization/spike/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, dtc, pkgsCross }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, dtc, pkgsCross }:
stdenv.mkDerivation rec {
pname = "spike";
@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-4D2Fezej0ioOOupw3kgMT5VLs+/jXQjwvek6v0AVMzI=";
};
patches = [
(fetchpatch {
name = "fesvr-fix-compilation-with-gcc-13.patch";
url = "https://github.com/riscv-software-src/riscv-isa-sim/commit/0a7bb5403d0290cea8b2356179d92e4c61ffd51d.patch";
hash = "sha256-JUMTbGawvLkoOWKkruzLzUFQytVR3wqTlGu/eegRFEE=";
})
];
nativeBuildInputs = [ dtc ];
enableParallelBuilding = true;

2
pkgs/top-level/all-packages.nix
View File

@ -35088,7 +35088,7 @@ with pkgs;
spice-vdagent = callPackage ../applications/virtualization/spice-vdagent { };
spike = pin-to-gcc12-if-gcc13 (callPackage ../applications/virtualization/spike { });
spike = callPackage ../applications/virtualization/spike { };
tensorman = callPackage ../tools/misc/tensorman { };